[RFA] Remove ${objdir} from test messages

[RFA] Remove ${objdir} from test messages

[Thiago Jung Bauermann]

Hi,

When I compare testsuite results, these messages always stand out even
though the tests have the same results, since the build directory is
different for each testsuite run. This patch changes the test messages
to be constant. Ok?
-- 
[]'s
Thiago Jung Bauermann
IBM Linux Technology Center


2011-02-04  Thiago Jung Bauermann  <bauerman@br.ibm.com>

	* gdb.base/break-interp.exp: Remove ${objdir} from test messages.
	* gdb.base/jit.exp: Likewise.
	* gdb.base/pie-execl.exp: Likewise.
	* gdb.base/solib-nodir.exp: Likewise.
	* gdb.base/solib-overlap.exp: Likewise.


diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 7afd919..3df4dcb 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -390,7 +390,7 @@ proc test_ld {file ifmain trynosym displacement} {
 	global objdir binfile_test
 
 	# ld.so needs some executable to run to reach _dl_debug_state.
-	gdb_test_no_output "set args ${objdir}/${subdir}/$binfile_test"
+	gdb_test_no_output "set args ${objdir}/${subdir}/$binfile_test" "set args OBJDIR/${subdir}/$binfile_test"
     }
 
     reach "_dl_debug_state" "run" $displacement
diff --git a/gdb/testsuite/gdb.base/jit.exp b/gdb/testsuite/gdb.base/jit.exp
index 6b232ba..1b731b0 100644
--- a/gdb/testsuite/gdb.base/jit.exp
+++ b/gdb/testsuite/gdb.base/jit.exp
@@ -43,6 +43,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 set solib_testfile "jit-solib"
 set solib_srcfile "${srcdir}/${subdir}/${solib_testfile}.c"
 set solib_binfile "${objdir}/${subdir}/${solib_testfile}.so"
+set solib_binfile_test_msg "OBJDIR/${subdir}/${solib_testfile}.so"
 
 # Note: compiling without debug info: the library goes through symbol
 # renaming by munging on its symbol table, and that wouldn't work for .debug
@@ -53,7 +54,7 @@ if { [gdb_compile_shlib ${solib_srcfile} ${solib_binfile} {-fPIC}] != "" } {
 }
 
 proc one_jit_test {count match_str} {
-    global verbose testfile solib_binfile pf_prefix
+    global verbose testfile solib_binfile solib_binfile_test_msg pf_prefix
 
     set old_pf_prefix $pf_prefix
     set pf_prefix "one_jit_test-$count"
@@ -75,9 +76,9 @@ proc one_jit_test {count match_str} {
 
     # Poke desired values directly into inferior instead of using "set args"
     # because "set args" does not work under gdbserver.
-    gdb_test "set var argc = 2"
-    gdb_test "set var libname = \"$solib_binfile\""
-    gdb_test "set var count = $count"
+    gdb_test_no_output "set var argc = 2"
+    gdb_test_no_output "set var libname = \"$solib_binfile\"" "set var libname = \"$solib_binfile_test_msg\""
+    gdb_test_no_output "set var count = $count"
 
     gdb_breakpoint [gdb_get_line_number "break here 1"]
     gdb_continue_to_breakpoint "break here 1"
diff --git a/gdb/testsuite/gdb.base/pie-execl.exp b/gdb/testsuite/gdb.base/pie-execl.exp
index c34eb22..122a98b 100644
--- a/gdb/testsuite/gdb.base/pie-execl.exp
+++ b/gdb/testsuite/gdb.base/pie-execl.exp
@@ -32,6 +32,7 @@ set executable1 ${testfile}1
 set executable2 ${testfile}2
 set binfile1 ${objdir}/${subdir}/${executable1}
 set binfile2 ${objdir}/${subdir}/${executable2}
+set binfile2_test_msg OBJDIR/${subdir}/${executable2}
 
 # Use conditional compilation according to `BIN' as GDB remembers the source
 # file name of the breakpoint.
@@ -44,7 +45,7 @@ if {[build_executable ${testfile}.exp $executable1 $srcfile [concat $opts {addit
 
 clean_restart ${executable1}
 
-gdb_test_no_output "set args ${binfile2}"
+gdb_test_no_output "set args ${binfile2}" "set args ${binfile2_test_msg}"
 
 if ![runto_main] {
     return -1
diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.base/solib-nodir.exp
index be444d3..04b96dc 100644
--- a/gdb/testsuite/gdb.base/solib-nodir.exp
+++ b/gdb/testsuite/gdb.base/solib-nodir.exp
@@ -44,7 +44,7 @@ clean_restart $executable
 gdb_load_shlibs ${binlibfile}
 
 gdb_test_no_output "set env LD_LIBRARY_PATH=:"
-gdb_test "cd ${binlibfiledir}" "Working directory [string_to_regexp ${binlibfiledir}]\\."
+gdb_test "cd ${binlibfiledir}" "Working directory [string_to_regexp ${binlibfiledir}]\\." "cd OBJDIR/${subdir}"
 
 set test "library loaded"
 if [runto_main] {
diff --git a/gdb/testsuite/gdb.base/solib-overlap.exp b/gdb/testsuite/gdb.base/solib-overlap.exp
index 428fa2c..c6a4c43 100644
--- a/gdb/testsuite/gdb.base/solib-overlap.exp
+++ b/gdb/testsuite/gdb.base/solib-overlap.exp
@@ -60,25 +60,28 @@ foreach prelink_lib1 {0x40000000 0x50000000} {
 
     # Library file.
     set binfile_lib1 ${objdir}/${subdir}/${libname}1-${prelink_lib1}.so
+    set binfile_lib1_test_msg OBJDIR/${subdir}/${libname}1-${prelink_lib1}.so
     set binfile_lib2 ${objdir}/${subdir}/${libname}2-${prelink_lib1}.so
+    set binfile_lib2_test_msg OBJDIR/${subdir}/${libname}2-${prelink_lib1}.so
     set lib_flags {debug}
     # Binary file.
     set binfile_base ${testfile}-${prelink_lib1}
     set binfile ${objdir}/${subdir}/${binfile_base}
+    set binfile_test_msg OBJDIR/${subdir}/${binfile_base}
     set bin_flags [list debug shlib=${binfile_lib1} shlib=${binfile_lib2}]
     set escapedbinfile  [string_to_regexp ${binfile}]
 
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
 	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""
 	 || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
-	untested "Could not compile ${binfile_lib1}, ${binfile_lib2} or ${binfile}."
+	untested "Could not compile ${binfile_lib1_test_msg}, ${binfile_lib2_test_msg} or ${binfile_test_msg}."
 	return -1
     }
 
     if {[catch "system \"prelink -N -r ${prelink_lib1} ${binfile_lib1}\""] != 0
 	|| [catch "system \"prelink -N -r ${prelink_lib2} ${binfile_lib2}\""] != 0} {
 	# Maybe we don't have prelink.
-	untested "Could not prelink ${binfile_lib1} or ${binfile_lib2}."
+	untested "Could not prelink ${binfile_lib1_test_msg} or ${binfile_lib2_test_msg}."
 	return -1
     }
 
@@ -101,7 +104,7 @@ foreach prelink_lib1 {0x40000000 0x50000000} {
 
     if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib1} $lib_flags] != ""
 	 || [gdb_compile_shlib ${srcfile_lib} ${binfile_lib2} $lib_flags] != ""} {
-	untested "Could not recompile ${binfile_lib1} or ${binfile_lib2}."
+	untested "Could not recompile ${binfile_lib1_test_msg} or ${binfile_lib2_test_msg}."
 	remote_exec build "kill -9 ${testpid}"
 	return -1
     }

Re: [RFA] Remove ${objdir} from test messages

[Joel Brobecker]

> 2011-02-04  Thiago Jung Bauermann  <bauerman@br.ibm.com>
> 
> 	* gdb.base/break-interp.exp: Remove ${objdir} from test messages.
> 	* gdb.base/jit.exp: Likewise.
> 	* gdb.base/pie-execl.exp: Likewise.
> 	* gdb.base/solib-nodir.exp: Likewise.
> 	* gdb.base/solib-overlap.exp: Likewise.

This is OK.  I would have probably done things a little differently,
as I don't think it really matters that the test label says exactly
what command was sent, as long as it's descriptive and unique. So
I would have probably chosen things like "set args $binfile_test"...
But since you've done it this way, no need to spend even more time
on this...

-- 
Joel

Re: [RFA] Remove ${objdir} from test messages

[Thiago Jung Bauermann]

On Sun, 2011-02-06 at 11:16 +0400, Joel Brobecker wrote:
> > 2011-02-04  Thiago Jung Bauermann  <bauerman@br.ibm.com>
> > 
> > 	* gdb.base/break-interp.exp: Remove ${objdir} from test messages.
> > 	* gdb.base/jit.exp: Likewise.
> > 	* gdb.base/pie-execl.exp: Likewise.
> > 	* gdb.base/solib-nodir.exp: Likewise.
> > 	* gdb.base/solib-overlap.exp: Likewise.
> 
> This is OK.  I would have probably done things a little differently,
> as I don't think it really matters that the test label says exactly
> what command was sent, as long as it's descriptive and unique. So
> I would have probably chosen things like "set args $binfile_test"...
> But since you've done it this way, no need to spend even more time
> on this...

I'm not very familiar with the testcases, so I chose to preserve as much
of the original output as possible. Thanks for the review!
-- 
[]'s
Thiago Jung Bauermann
IBM Linux Technology Center

Re: [RFA] Remove ${objdir} from test messages

[Thiago Jung Bauermann]

On Mon, 2011-02-07 at 11:37 -0200, Thiago Jung Bauermann wrote:
> I'm not very familiar with the testcases, so I chose to preserve as much
> of the original output as possible. Thanks for the review!

Er, forgot to mention: committed. :-)
-- 
[]'s
Thiago Jung Bauermann
IBM Linux Technology Center