diff options
| author | Jacob Bachmeyer <jcb@gnu.org> | 2021-03-26 23:04:15 -0500 |
|---|---|---|
| committer | Jacob Bachmeyer <jcb@gnu.org> | 2021-03-26 23:04:15 -0500 |
| commit | a8a331ee5b0953ee3ca11764e4a6e4f2af8722c9 (patch) | |
| tree | 6afa3ab9be4488de2ec69a75cece99ad61d3fa96 /testsuite | |
| parent | ed6511a32895f6af1451adcdd42815adcde7341a (diff) | |
Address PR47386
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/launcher.all/help.exp | 10 | ||||
| -rw-r--r-- | testsuite/lib/launcher.exp | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/testsuite/launcher.all/help.exp b/testsuite/launcher.all/help.exp index 34eb68d..8e128f2 100644 --- a/testsuite/launcher.all/help.exp +++ b/testsuite/launcher.all/help.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Free Software Foundation, Inc. +# Copyright (C) 2018, 2021 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -21,10 +21,10 @@ # each element: { name args envars exit_code output_re... } set tests { { "dejagnu help selects dejagnu(1) manpage" - {help -v} {MANPAGER=echo} 0 + {help -v} {MANPAGER=echo PAGER=echo} 0 "Forwarding to man \".*doc/dejagnu\\.1\"" } { "dejagnu help help selects dejagnu-help(1) manpage" - {help -v help} {MANPAGER=echo} 0 + {help -v help} {MANPAGER=echo PAGER=echo} 0 "Forwarding to man \".*doc/dejagnu-help\\.1\"" } } @@ -32,6 +32,10 @@ if { ![file isdirectory [file join [file dirname $LAUNCHER] commands]] } { skip_dejagnu_launcher_tests \ "The 'commands' directory is not present in the source tree." \ unsupported $tests +} elseif { [istarget *-*-solaris*] } { + skip_dejagnu_launcher_tests \ + "The 'man' command in Solaris does not work in the source tree." \ + unsupported $tests } else { run_dejagnu_launcher_tests $LAUNCHER $tests } diff --git a/testsuite/lib/launcher.exp b/testsuite/lib/launcher.exp index c9a40e7..6b4136a 100644 --- a/testsuite/lib/launcher.exp +++ b/testsuite/lib/launcher.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Free Software Foundation, Inc. +# Copyright (C) 2018, 2021 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -44,7 +44,9 @@ proc dejagnu_run { launcher arglist envlist } { # reset errorCode catch { error } + verbose -log "Running \"[lrange $exec_cmd 1 end] $arglist\" ..." catch { eval $exec_cmd $arglist } output + verbose -log $output if { [lindex $errorCode 0] eq "CHILDSTATUS" } { return [list $output [lindex $errorCode 2]] |