Commit 1ef3b58e by Iain Sandoe Committed by Mike Stump

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
parent 6c84d576
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> 2013-06-10 Thomas Schwinge <thomas@codesourcery.com>
* testsuite/libgomp.c/icv-2.c: Extend current handling of * testsuite/libgomp.c/icv-2.c: Extend current handling of
......
...@@ -9,24 +9,27 @@ proc load_gcc_lib { filename } { ...@@ -9,24 +9,27 @@ proc load_gcc_lib { filename } {
} }
load_lib dg.exp 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 target-supports.exp
load_gcc_lib file-format.exp
load_gcc_lib target-supports-dg.exp load_gcc_lib target-supports-dg.exp
load_gcc_lib scanasm.exp load_gcc_lib scanasm.exp
load_gcc_lib scandump.exp load_gcc_lib scandump.exp
load_gcc_lib scanrtl.exp load_gcc_lib scanrtl.exp
load_gcc_lib scantree.exp load_gcc_lib scantree.exp
load_gcc_lib scanipa.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 timeout-dg.exp
load_gcc_lib torture-options.exp
load_gcc_lib fortran-modules.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 set dg-do-what-default run
......
load_lib libgomp-dg.exp load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp
global shlib_ext global shlib_ext
...@@ -53,7 +54,7 @@ if { $lang_test_file_found } { ...@@ -53,7 +54,7 @@ if { $lang_test_file_found } {
} }
# Main loop. # Main loop.
gfortran-dg-runtest $tests $libstdcxx_includes dg-runtest $tests "" $libstdcxx_includes
} }
# All done. # All done.
......
...@@ -7,6 +7,7 @@ if [info exists lang_test_file] then { ...@@ -7,6 +7,7 @@ if [info exists lang_test_file] then {
} }
load_lib libgomp-dg.exp load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp
# If a testcase doesn't have special options, use these. # If a testcase doesn't have special options, use these.
if ![info exists DEFAULT_CFLAGS] then { if ![info exists DEFAULT_CFLAGS] then {
......
load_lib libgomp-dg.exp load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp
load_gcc_lib gfortran-dg.exp
global shlib_ext global shlib_ext
global ALWAYS_CFLAGS global ALWAYS_CFLAGS
......
...@@ -23,6 +23,7 @@ if [info exists lang_test_file] then { ...@@ -23,6 +23,7 @@ if [info exists lang_test_file] then {
} }
load_lib libgomp-dg.exp load_lib libgomp-dg.exp
load_gcc_lib gcc-dg.exp
if ![check_effective_target_pthread] { if ![check_effective_target_pthread] {
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment