diff options
| author | Tom de Vries <tom@codesourcery.com> | 2017-09-14 21:15:40 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2017-09-14 21:15:40 +0000 |
| commit | 82419efbbfcf537f890b9095fdccc1ac44b9ef34 (patch) | |
| tree | ed1bf026e4635d1e7bb092e666ee4b13e1acfbc6 /libgomp/testsuite/libgomp.c++ | |
| parent | 12fca96eb386678706a0d87515c2d3412a67ad4d (diff) | |
| download | gcc-82419efbbfcf537f890b9095fdccc1ac44b9ef34.zip gcc-82419efbbfcf537f890b9095fdccc1ac44b9ef34.tar.gz gcc-82419efbbfcf537f890b9095fdccc1ac44b9ef34.tar.bz2 | |
Introduce libgomp/testsuite/libgomp.c-c++-common
2017-09-14 Tom de Vries <tom@codesourcery.com>
* testsuite/libgomp.c++/cancel-taskgroup-1.C: Remove.
* testsuite/libgomp.c/cancel-taskgroup-1.c: Move to ...
* testsuite/libgomp.c-c++-common/cancel-taskgroup-1.c: ... here.
* testsuite/libgomp.c/c.exp: Include test-cases from
libgomp.c-c++-common.
* testsuite/libgomp.c++/c++.exp: Same. Force c++-mode compilation of .c
files.
From-SVN: r252775
Diffstat (limited to 'libgomp/testsuite/libgomp.c++')
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/c++.exp | 12 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c++/cancel-taskgroup-1.C | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/libgomp/testsuite/libgomp.c++/c++.exp b/libgomp/testsuite/libgomp.c++/c++.exp index 0454f95..f4884e2 100644 --- a/libgomp/testsuite/libgomp.c++/c++.exp +++ b/libgomp/testsuite/libgomp.c++/c++.exp @@ -22,6 +22,11 @@ dg-init # Turn on OpenMP. lappend ALWAYS_CFLAGS "additional_flags=-fopenmp" +# Switch into C++ mode. Otherwise, the libgomp.c-c++-common/*.c +# files would be compiled as C files. +set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST" +set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++" + set blddir [lookfor_file [get_multilibs] libgomp] @@ -47,7 +52,9 @@ if { $blddir != "" } { if { $lang_test_file_found } { # Gather a list of all tests. - set tests [lsort [find $srcdir/$subdir *.C]] + set tests [lsort [concat \ + [find $srcdir/$subdir *.C] \ + [find $srcdir/$subdir/../libgomp.c-c++-common *.c]]] if { $blddir != "" } { set ld_library_path "$always_ld_library_path:${blddir}/${lang_library_path}" @@ -68,5 +75,8 @@ if { $lang_test_file_found } { dg-runtest $tests "" "$libstdcxx_includes $DEFAULT_CFLAGS" } +# See above. +set GCC_UNDER_TEST "$SAVE_GCC_UNDER_TEST" + # All done. dg-finish diff --git a/libgomp/testsuite/libgomp.c++/cancel-taskgroup-1.C b/libgomp/testsuite/libgomp.c++/cancel-taskgroup-1.C deleted file mode 100644 index 4f66859..0000000 --- a/libgomp/testsuite/libgomp.c++/cancel-taskgroup-1.C +++ /dev/null @@ -1,4 +0,0 @@ -// { dg-do run } -// { dg-set-target-env-var OMP_CANCELLATION "true" } - -#include "../libgomp.c/cancel-taskgroup-1.c" |