Skip argv0-symlink.exp on target argv[0] isn't available
Commit Message
Pedro Alves <palves@redhat.com> writes:
> I think we shouldn't skip the whole test though; only the
> printing argv[0] test. The test file also makes sure
> that "info inferiors" shows the symlink name, not the target
> of the symlink, and that is host-dependent, not target
> dependent. See git 4856b6bc.
Yeah, we can wrap the test on argv[0] with if { $has_argv0 } {...}. See
below in the updated patch.
>> +
>> + send_gdb "p argv\[0\]\n"
>> + gdb_expect {
>> + -re " = $hex \".*$exe\"\r\n${gdb_prompt} $" {
>
> I suspect this may break if remote (host|target) testing,
> and not sharing the filesystem between build/host/target.
> Isn't $exe here a full path on the build?
>
$exe can be a full path, and can be a base name too. It depends on proc
standard_temp_file. You are right that it is a mistake to use the build
file path on host. I change it to
".*[file tail $exe]\"\r\n${gdb_prompt} $"
>> + return 1
>> + }
>> + -re "${gdb_prompt} $" {
>> + return 0
>> + }
>> + }
>> + }
>> + -re "${gdb_prompt} $" {
>> + return 0
>> + }
>> + }
>> + return 0
>> + }
>> +
>
> I think these gdb_expect's should be gdb_test_multiple's instead.
Fixed.
Comments
On 10/17/2014 08:20 AM, Yao Qi wrote:
>>> >> +
>>> >> + send_gdb "p argv\[0\]\n"
>>> >> + gdb_expect {
>>> >> + -re " = $hex \".*$exe\"\r\n${gdb_prompt} $" {
>> >
>> > I suspect this may break if remote (host|target) testing,
>> > and not sharing the filesystem between build/host/target.
>> > Isn't $exe here a full path on the build?
>> >
> $exe can be a full path, and can be a base name too. It depends on proc
> standard_temp_file. You are right that it is a mistake to use the build
> file path on host. I change it to
>
> ".*[file tail $exe]\"\r\n${gdb_prompt} $"
OK. So I'm somewhat worried about silently reducing coverage due to
some problem here, either now, or in the future.
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
}
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"
}
> + # 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)
@@ -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,9 @@ 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
+}
# 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 +77,12 @@ 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
}
-gdb_test {print argv[0]} "/$dirlink/$filelink\"" $test
+
gdb_test "info inferiors" "/$lastdir/$filelink *" "$test for info inferiors"
@@ -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,7 +88,8 @@ proc test_value_in_inferior {} {
"set arg0"
# Check that the dereferenced value is sane.
- if { ! [target_info exists noargs] } {
+ global has_argv0
+ if { $has_argv0 } {
gdb_test "gu (print arg0)" \
"0x.*$testfile\"" "verify dereferenced value"
}
@@ -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,7 +223,8 @@ 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] } {
+ global has_argv0
+ if { $has_argv0 } {
gdb_test "python print (arg0)" "0x.*$testfile\"" "verify dereferenced value"
}
@@ -4227,6 +4227,82 @@ 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 decimal
+
+ 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
+
+ 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