diff options
| author | Iain Sandoe <iain@codesourcery.com> | 2013-06-20 16:48:26 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 2013-06-20 16:48:26 +0000 |
| commit | 1ef3b58e572bc76797b69159117ba8ab6da13391 (patch) | |
| tree | d3624cce2523466dc6b8640cd256b60aa0289738 | |
| parent | 6c84d5762f1e1a60b1d4cee0caf8b4e7e0ba5f6f (diff) | |
| download | gcc-1ef3b58e572bc76797b69159117ba8ab6da13391.zip gcc-1ef3b58e572bc76797b69159117ba8ab6da13391.tar.gz gcc-1ef3b58e572bc76797b69159117ba8ab6da13391.tar.bz2 | |
libgomp.exp: Reorder lib loads into dependency order.
2013-06-20 Iain Sandoe <iain@codesourcery.com>
Cesar Philippidis <cesar@codesourcery.com>
* testsuite/lib/libgomp.exp: Reorder lib loads into dependency order.
Do not load_gcc_lib gcc-dg.exp and add a comment as to why.
* testsuite/libgomp.c/c.exp: load_gcc_lib gcc-dg.exp.
* testsuite/libgomp.fortran/fortran.exp: Likewise.
* testsuite/libgomp.graphite/graphite.exp: Likewise.
* testsuite/libgomp.c++/c++.exp: load_gcc_lib gcc-dg.exp.
Use dg-runtest rather than gfortran-dg-runtest.
Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com>
From-SVN: r200253
| -rw-r--r-- | libgomp/ChangeLog | 11 | ||||
| -rw-r--r-- | libgomp/testsuite/lib/libgomp.exp | 21 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/c++.exp | 3 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c/c.exp | 1 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.fortran/fortran.exp | 2 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.graphite/graphite.exp | 1 |
6 files changed, 29 insertions, 10 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 1a0f133..9a57573 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,14 @@ +2013-06-20 Iain Sandoe <iain@codesourcery.com> + Cesar Philippidis <cesar@codesourcery.com> + + * testsuite/lib/libgomp.exp: Reorder lib loads into dependency order. + Do not load_gcc_lib gcc-dg.exp and add a comment as to why. + * testsuite/libgomp.c/c.exp: load_gcc_lib gcc-dg.exp. + * testsuite/libgomp.fortran/fortran.exp: Likewise. + * testsuite/libgomp.graphite/graphite.exp: Likewise. + * testsuite/libgomp.c++/c++.exp: load_gcc_lib gcc-dg.exp. + Use dg-runtest rather than gfortran-dg-runtest. + 2013-06-10 Thomas Schwinge <thomas@codesourcery.com> * testsuite/libgomp.c/icv-2.c: Extend current handling of diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index cd561bf..72daa7e 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -9,24 +9,27 @@ proc load_gcc_lib { filename } { } load_lib dg.exp -load_gcc_lib file-format.exp + +# Required to use gcc-dg.exp - however, the latter should NOT be +# loaded until ${tool}_target_compile is defined since it uses that +# to determine default LTO options. + +load_gcc_lib prune.exp +load_gcc_lib target-libpath.exp +load_gcc_lib wrapper.exp +load_gcc_lib gcc-defs.exp +load_gcc_lib timeout.exp load_gcc_lib target-supports.exp +load_gcc_lib file-format.exp load_gcc_lib target-supports-dg.exp load_gcc_lib scanasm.exp load_gcc_lib scandump.exp load_gcc_lib scanrtl.exp load_gcc_lib scantree.exp load_gcc_lib scanipa.exp -load_gcc_lib prune.exp -load_gcc_lib target-libpath.exp -load_gcc_lib wrapper.exp -load_gcc_lib gcc-defs.exp -load_gcc_lib torture-options.exp -load_gcc_lib timeout.exp load_gcc_lib timeout-dg.exp +load_gcc_lib torture-options.exp load_gcc_lib fortran-modules.exp -load_gcc_lib gcc-dg.exp -load_gcc_lib gfortran-dg.exp set dg-do-what-default run diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index decda3d..b336306 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -1,4 +1,5 @@ load_lib libgomp-dg.exp +load_gcc_lib gcc-dg.exp global shlib_ext @@ -53,7 +54,7 @@ if { $lang_test_file_found } { } # Main loop. - gfortran-dg-runtest $tests $libstdcxx_includes + dg-runtest $tests "" $libstdcxx_includes } # All done. diff --git a/libgomp/testsuite/libgomp.c/c.exp b/libgomp/testsuite/libgomp.c/c.exp index 980bb52..7dfdf8b 100644 --- a/libgomp/testsuite/libgomp.c/c.exp +++ b/libgomp/testsuite/libgomp.c/c.exp @@ -7,6 +7,7 @@ if [info exists lang_test_file] then { } load_lib libgomp-dg.exp +load_gcc_lib gcc-dg.exp # If a testcase doesn't have special options, use these. if ![info exists DEFAULT_CFLAGS] then { diff --git a/libgomp/testsuite/libgomp.fortran/fortran.exp b/libgomp/testsuite/libgomp.fortran/fortran.exp index 40ac840..b7fef29 100644 --- a/libgomp/testsuite/libgomp.fortran/fortran.exp +++ b/libgomp/testsuite/libgomp.fortran/fortran.exp @@ -1,4 +1,6 @@ load_lib libgomp-dg.exp +load_gcc_lib gcc-dg.exp +load_gcc_lib gfortran-dg.exp global shlib_ext global ALWAYS_CFLAGS diff --git a/libgomp/testsuite/libgomp.graphite/graphite.exp b/libgomp/testsuite/libgomp.graphite/graphite.exp index e676ad3..08aa509 100644 --- a/libgomp/testsuite/libgomp.graphite/graphite.exp +++ b/libgomp/testsuite/libgomp.graphite/graphite.exp @@ -23,6 +23,7 @@ if [info exists lang_test_file] then { } load_lib libgomp-dg.exp +load_gcc_lib gcc-dg.exp if ![check_effective_target_pthread] { return |