diff mbox

Skip argv0-symlink.exp on target argv[0] isn't available

Message ID 874mv2ltut.fsf@codesourcery.com
State New
Headers show

Commit Message

Yao Qi Oct. 17, 2014, 1:16 p.m. UTC
Pedro Alves <palves@redhat.com> writes:

> So how about instead of silently skipping the tests, call
> unsupported, like:
>
>   global has_argv0
>   set test "verify dereferenced value"
>   if { $has_argv0 } {
>      gdb_test "python print (arg0)" "0x.*$testfile\"" $test
>   } else {
>      unsupported $test
>   }
>

OK, fixed in the updated patch.

> etc.
>
>> +gdb_caching_proc gdb_has_argv0 {
>> +    set result 0
> ...
>> +    # Helper proc.
>> +    proc gdb_has_argv0_1 { exe } {
> ...
>> +    set result [gdb_has_argv0_1 $exe]
>
> And then in addition, add an assert here for the main OSs
> we support, like so:
>
>  if { !$result
>       && ([istarget *-*-linux*]
>          || [istarget *-*-gnu*]
>          || [istarget *-*-cygwin*]
>          || [istarget *-*-mingw*]
>          || [istarget *-*-darwin*]
>          || [istarget *-*-bsd*]
>          || [istarget *-*-solaris*]
>          || [istarget *-*-msdosdjgpp*]
>          || [istarget *-*-go32*]
> 	 || [istarget *-*-aix*]
>          || [istarget *-*-hpux*]) } {
>     fail "argv[0] should be available on this target"
>  }
>

OK, I list all OSes GDB supports (extracted from configure.tgt and configure.ac).

>> +    # Helper proc.
>> +    proc gdb_has_argv0_1 { exe } {
>> +	global srcdir subdir
>> +	global gdb_prompt hex decimal
>> +
>> +	gdb_exit
>> +	gdb_start
>> +	gdb_reinitialize_dir $srcdir/$subdir
>> +	gdb_load "$exe"
>
> BTW, use clean_restart here?  (if so, I think 'global srcdir subdir'
> becomes unnecessary too)

Unfortunately we can't.  clean_restart loads file from $objdir/$subdir,
but $exe is in $objdir or $objdir/temp.

Comments

Pedro Alves Oct. 17, 2014, 1:27 p.m. UTC | #1
On 10/17/2014 02:16 PM, Yao Qi wrote:
> Pedro Alves <palves@redhat.com> writes:
> 
>> So how about instead of silently skipping the tests, call
>> unsupported, like:
>>
>>   global has_argv0
>>   set test "verify dereferenced value"
>>   if { $has_argv0 } {
>>      gdb_test "python print (arg0)" "0x.*$testfile\"" $test
>>   } else {
>>      unsupported $test
>>   }
>>
> 
> OK, fixed in the updated patch.
> 
>> etc.
>>
>>> +gdb_caching_proc gdb_has_argv0 {
>>> +    set result 0
>> ...
>>> +    # Helper proc.
>>> +    proc gdb_has_argv0_1 { exe } {
>> ...
>>> +    set result [gdb_has_argv0_1 $exe]
>>
>> And then in addition, add an assert here for the main OSs
>> we support, like so:
>>
>>  if { !$result
>>       && ([istarget *-*-linux*]
>>          || [istarget *-*-gnu*]
>>          || [istarget *-*-cygwin*]
>>          || [istarget *-*-mingw*]
>>          || [istarget *-*-darwin*]
>>          || [istarget *-*-bsd*]
>>          || [istarget *-*-solaris*]
>>          || [istarget *-*-msdosdjgpp*]
>>          || [istarget *-*-go32*]
>> 	 || [istarget *-*-aix*]
>>          || [istarget *-*-hpux*]) } {
>>     fail "argv[0] should be available on this target"
>>  }
>>
> 
> OK, I list all OSes GDB supports (extracted from configure.tgt and configure.ac).
> 
>>> +    # Helper proc.
>>> +    proc gdb_has_argv0_1 { exe } {
>>> +	global srcdir subdir
>>> +	global gdb_prompt hex decimal
>>> +
>>> +	gdb_exit
>>> +	gdb_start
>>> +	gdb_reinitialize_dir $srcdir/$subdir
>>> +	gdb_load "$exe"
>>
>> BTW, use clean_restart here?  (if so, I think 'global srcdir subdir'
>> becomes unnecessary too)
> 
> Unfortunately we can't.  clean_restart loads file from $objdir/$subdir,
> but $exe is in $objdir or $objdir/temp.
> 

OK.  This version looks good to me.

Thanks,
Pedro Alves
Yao Qi Oct. 18, 2014, 12:59 p.m. UTC | #2
Pedro Alves <palves@redhat.com> writes:

> OK.  This version looks good to me.

Thanks, patch is pushed in.
diff mbox

Patch

diff --git a/gdb/testsuite/gdb.base/argv0-symlink.exp b/gdb/testsuite/gdb.base/argv0-symlink.exp
index d849b4c..cd459bb 100644
--- a/gdb/testsuite/gdb.base/argv0-symlink.exp
+++ b/gdb/testsuite/gdb.base/argv0-symlink.exp
@@ -15,6 +15,8 @@ 
 
 standard_testfile
 
+set has_argv0 [gdb_has_argv0]
+
 if { [build_executable ${testfile}.exp ${testfile} ${srcfile}] == -1 } {
     return -1
 }
@@ -39,7 +41,11 @@  if ![runto_main] {
 gdb_test_no_output "set print repeats 10000"
 gdb_test_no_output "set print elements 10000"
 
-gdb_test {print argv[0]} "/$filelink\"" $test
+if { $has_argv0 } {
+    gdb_test {print argv[0]} "/$filelink\"" $test
+} else {
+    unsupported $test
+}
 
 # For a link named /PATH/TO/DIR/LINK, we want to check the output
 # against "/DIR/LINK", but computed in a way that doesn't make
@@ -73,9 +79,14 @@  if ![runto_main] {
 gdb_test_no_output "set print repeats 10000"
 gdb_test_no_output "set print elements 10000"
 
-# gdbserver does not have this issue.
-if ![is_remote target] {
-    setup_kfail "*-*-*" gdb/15934
+if { $has_argv0 } {
+    # gdbserver does not have this issue.
+    if ![is_remote target] {
+	setup_kfail "*-*-*" gdb/15934
+    }
+    gdb_test {print argv[0]} "/$dirlink/$filelink\"" $test
+} else {
+    unsupported $test
 }
-gdb_test {print argv[0]} "/$dirlink/$filelink\"" $test
+
 gdb_test "info inferiors" "/$lastdir/$filelink *" "$test for info inferiors"
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index ae80d1b..033633c 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -20,6 +20,8 @@  load_lib gdb-guile.exp
 
 standard_testfile
 
+set has_argv0 [gdb_has_argv0]
+
 # Build inferior to language specification.
 # LANG is one of "c" or "c++".
 proc build_inferior {exefile lang} {
@@ -86,9 +88,12 @@  proc test_value_in_inferior {} {
 	"set arg0"
 
     # Check that the dereferenced value is sane.
-    if { ! [target_info exists noargs] } {
-	gdb_test "gu (print arg0)" \
-	    "0x.*$testfile\"" "verify dereferenced value"
+    global has_argv0
+    set test "verify dereferenced value"
+    if { $has_argv0 } {
+	gdb_test "gu (print arg0)" "0x.*$testfile\"" $test
+    } else {
+	unsupported $test
     }
 
     # Smoke-test value-optimized-out?.
diff --git a/gdb/testsuite/gdb.python/py-value.exp b/gdb/testsuite/gdb.python/py-value.exp
index 0d18bef..0e1534a 100644
--- a/gdb/testsuite/gdb.python/py-value.exp
+++ b/gdb/testsuite/gdb.python/py-value.exp
@@ -20,6 +20,8 @@  load_lib gdb-python.exp
 
 standard_testfile
 
+set has_argv0 [gdb_has_argv0]
+
 # Build inferior to language specification.
 # LANG is one of "c" or "c++".
 proc build_inferior {exefile lang} {
@@ -221,8 +223,12 @@  proc test_value_in_inferior {} {
   gdb_py_test_silent_cmd "python arg0 = argv.dereference ()" "dereference value" 1
 
   # Check that the dereferenced value is sane
-  if { ! [target_info exists noargs] } {
-    gdb_test "python print (arg0)" "0x.*$testfile\"" "verify dereferenced value"
+  global has_argv0
+  set test "verify dereferenced value"
+  if { $has_argv0 } {
+    gdb_test "python print (arg0)" "0x.*$testfile\"" $test
+  } else {
+    unsupported $test
   }
 
   # Smoke-test is_optimized_out attribute
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 7b2a402..37e701c 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4227,6 +4227,104 @@  gdb_caching_proc gdb_skip_xml_test {
     return $xml_missing
 }
 
+# Return true if argv[0] is available.
+
+gdb_caching_proc gdb_has_argv0 {
+    set result 0
+
+    # Set up, compile, and execute a test program to check whether
+    # argv[0] is available.
+    set src [standard_temp_file has_argv0[pid].c]
+    set exe [standard_temp_file has_argv0[pid].x]
+
+    gdb_produce_source $src {
+	int main (int argc, char **argv) {
+	    return 0;
+	}
+    }
+
+    gdb_compile $src $exe executable {debug}
+
+    # Helper proc.
+    proc gdb_has_argv0_1 { exe } {
+	global srcdir subdir
+	global gdb_prompt hex
+
+	gdb_exit
+	gdb_start
+	gdb_reinitialize_dir $srcdir/$subdir
+	gdb_load "$exe"
+
+	# Set breakpoint on main.
+	gdb_test_multiple "break main" "break main" {
+	    -re "Breakpoint.*${gdb_prompt} $" {
+	    }
+	    -re "${gdb_prompt} $" {
+		return 0
+	    }
+	}
+
+	# Run to main.
+	gdb_run_cmd
+	gdb_test_multiple "" "run to main" {
+	    -re "Breakpoint.*${gdb_prompt} $" {
+	    }
+	    -re "${gdb_prompt} $" {
+		return 0
+	    }
+	}
+
+	# Check whether argc is 1.
+	gdb_test_multiple "p argc" "p argc" {
+	    -re " = 1\r\n${gdb_prompt} $" {
+
+		gdb_test_multiple "p argv\[0\]" "p argv\[0\]" {
+		    -re " = $hex \".*[file tail $exe]\"\r\n${gdb_prompt} $" {
+			return 1
+		    }
+		    -re "${gdb_prompt} $" {
+			return 0
+		    }
+		}
+	    }
+	    -re "${gdb_prompt} $" {
+		return 0
+	    }
+	}
+	return 0
+    }
+
+    set result [gdb_has_argv0_1 $exe]
+
+    gdb_exit
+    file delete $src
+    file delete $exe
+
+    if { !$result
+      && ([istarget *-*-linux*]
+	  || [istarget *-*-freebsd*] || [istarget *-*-kfreebsd*]
+	  || [istarget *-*-netbsd*] || [istarget *-*-knetbsd*]
+	  || [istarget *-*-openbsd*]
+	  || [istarget *-*-darwin*]
+	  || [istarget *-*-solaris*]
+	  || [istarget *-*-aix*]
+	  || [istarget *-*-gnu*]
+	  || [istarget *-*-cygwin*] || [istarget *-*-mingw32*]
+	  || [istarget *-*-*djgpp*] || [istarget *-*-go32*]
+	  || [istarget *-wince-pe] || [istarget *-*-mingw32ce*]
+	  || [istarget *-*-symbianelf*]
+	  || [istarget *-*-osf*]
+	  || [istarget *-*-hpux*]
+	  || [istarget *-*-dicos*]
+	  || [istarget *-*-nto*]
+	  || [istarget *-*-*vms*]
+	  || [istarget *-*-lynx*178]) } {
+	fail "argv\[0\] should be available on this target"
+    }
+
+    return $result
+}
+
 # Note: the procedure gdb_gnu_strip_debug will produce an executable called
 # ${binfile}.dbglnk, which is just like the executable ($binfile) but without
 # the debuginfo. Instead $binfile has a .gnu_debuglink section which contains