diff options
Diffstat (limited to 'tests/cc')
-rw-r--r-- | tests/cc/libu/testscript | 2 | ||||
-rw-r--r-- | tests/cc/modules/common.testscript | 9 | ||||
-rw-r--r-- | tests/cc/modules/modules.testscript | 2 | ||||
-rw-r--r-- | tests/cc/preprocessed/testscript | 4 |
4 files changed, 12 insertions, 5 deletions
diff --git a/tests/cc/libu/testscript b/tests/cc/libu/testscript index 9db3406..b562157 100644 --- a/tests/cc/libu/testscript +++ b/tests/cc/libu/testscript @@ -2,7 +2,7 @@ # license : MIT; see accompanying LICENSE file crosstest = false -test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) +test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode) .include ../../common.testscript diff --git a/tests/cc/modules/common.testscript b/tests/cc/modules/common.testscript index 6f09c62..50dc865 100644 --- a/tests/cc/modules/common.testscript +++ b/tests/cc/modules/common.testscript @@ -2,7 +2,7 @@ # license : MIT; see accompanying LICENSE file crosstest = false -test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) +test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode) .include ../../common.testscript @@ -47,3 +47,10 @@ EOI +$* noop <<EOI | set headers print ($cxx.features.modules && $cxx.id == 'gcc') EOI + +# @@ TMP: modules support is broken in MinGW GCC (not just symexport). +# +if ($cxx.target.class == 'windows' && $cxx.id == 'gcc') + modules = false + headers = false +end diff --git a/tests/cc/modules/modules.testscript b/tests/cc/modules/modules.testscript index 681238a..8762885 100644 --- a/tests/cc/modules/modules.testscript +++ b/tests/cc/modules/modules.testscript @@ -354,7 +354,7 @@ $* test --verbose 1 <<EOI 2>>EOE; exe{test}: cxx{driver} {mxx}{foo-core} exe{test}: test.arguments = two EOI - c++ cxx{driver} + c++ cxx{driver} -> obje{driver} ld exe{test} test exe{test} EOE diff --git a/tests/cc/preprocessed/testscript b/tests/cc/preprocessed/testscript index 269cafe..507a92d 100644 --- a/tests/cc/preprocessed/testscript +++ b/tests/cc/preprocessed/testscript @@ -2,7 +2,7 @@ # license : MIT; see accompanying LICENSE file crosstest = false -test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) update +test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode) update .include ../../common.testscript @@ -10,7 +10,7 @@ test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) up # # trace: cxx::compile::apply extracting (headers|modules) from: .../obje{(test).o...} # -filter = sed -n -e \ +filter = [cmdline] sed -n -e \ \''s/^trace: cxx::compile_rule::apply: extracting ([^ ]+) from[^{]+\{([^.]+).*/\1 \2/p'\' +cat <<EOI >=build/root.build |