diff options
author | Tom de Vries <tdevries@suse.de> | 2021-09-10 17:16:48 +0200 |
---|---|---|
committer | Tom de Vries <tdevries@suse.de> | 2021-09-10 17:16:48 +0200 |
commit | 49a9ec7f6a37117519aba9d3e31b1fe17a9dc029 (patch) | |
tree | c64db3ecfc42a69a456e00b1035cfd74a0d0ba46 /gdb/testsuite | |
parent | e7776f52fedcafc63619abb2928151cf5bbfcce2 (diff) | |
download | gdb-49a9ec7f6a37117519aba9d3e31b1fe17a9dc029.zip gdb-49a9ec7f6a37117519aba9d3e31b1fe17a9dc029.tar.gz gdb-49a9ec7f6a37117519aba9d3e31b1fe17a9dc029.tar.bz2 |
[gdb/testsuite] Handle unrecognized command line option in gdb_compile_test
When running the gdb testsuite with gnatmake-4.8, I get many fails of the
following form:
...
gcc: error: unrecognized command line option '-fgnat-encodings=all'^M
gnatmake: "gdb.ada/O2_float_param/foo.adb" compilation error^M
compiler exited with status 1
compilation failed: gcc ... gdb.ada/O2_float_param/foo.adb
gcc: error: unrecognized command line option '-fgnat-encodings=all'
gnatmake: "gdb.ada/O2_float_param/foo.adb" compilation error
FAIL: gdb.ada/O2_float_param.exp: scenario=all: compilation foo.adb
...
Fix this by marking the test unsupported instead, such that we have:
...
UNSUPPORTED: gdb.ada/O2_float_param.exp: scenario=all: compilation foo.adb \
(unsupported option '-fgnat-encodings=all')
...
Tested on x86_64-linux.
Diffstat (limited to 'gdb/testsuite')
-rw-r--r-- | gdb/testsuite/lib/gdb.exp | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index ff19760..926c332 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2202,21 +2202,34 @@ proc gdb_interact { } { # Examine the output of compilation to determine whether compilation # failed or not. If it failed determine whether it is due to missing # compiler or due to compiler error. Report pass, fail or unsupported -# as appropriate +# as appropriate. proc gdb_compile_test {src output} { + set msg "compilation [file tail $src]" + if { $output == "" } { - pass "compilation [file tail $src]" - } elseif { [regexp {^[a-zA-Z_0-9]+: Can't find [^ ]+\.$} $output] } { - unsupported "compilation [file tail $src]" - } elseif { [regexp {.*: command not found[\r|\n]*$} $output] } { - unsupported "compilation [file tail $src]" - } elseif { [regexp {.*: [^\r\n]*compiler not installed[^\r\n]*[\r|\n]*$} $output] } { - unsupported "compilation [file tail $src]" - } else { - verbose -log "compilation failed: $output" 2 - fail "compilation [file tail $src]" + pass $msg + return + } + + if { [regexp {^[a-zA-Z_0-9]+: Can't find [^ ]+\.$} $output] + || [regexp {.*: command not found[\r|\n]*$} $output] + || [regexp {.*: [^\r\n]*compiler not installed[^\r\n]*[\r|\n]*$} $output] } { + unsupported "$msg (missing compiler)" + return } + + set gcc_re ".*: error: unrecognized command line option " + set clang_re ".*: error: unsupported option " + if { [regexp "(?:$gcc_re|$clang_re)(\[^ \t;\r\n\]*)" $output dummy option] + && $option != "" } { + unsupported "$msg (unsupported option $option)" + return + } + + # Unclassified compilation failure, be more verbose. + verbose -log "compilation failed: $output" 2 + fail "$msg" } # Return a 1 for configurations for which we don't even want to try to |