diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-07-16 09:05:04 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-07-16 09:05:04 +0200 |
| commit | 51ab0a979c5c53defd5eda9fa997b2abfd0d4f7d (patch) | |
| tree | a7be7d7a9c8956efc8f9cc81ab7e7576fe78668b /tests | |
| parent | bca2aa388e690d1e575d890cf15e0dc9632728f7 (diff) | |
Save original compiler path/mode in {c,cxx}.config.path/mode
It turns out that when propagating {c,cxx}.config in tests we don't want to
propagate any options (such as *.std) that have been folded into our project's
mode.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cc/libu/testscript | 2 | ||||
| -rw-r--r-- | tests/cc/modules/common.testscript | 2 | ||||
| -rw-r--r-- | tests/cc/preprocessed/testscript | 2 | ||||
| -rw-r--r-- | tests/dependency/recipe/testscript | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/cc/libu/testscript b/tests/cc/libu/testscript index f52bd81..9db3406 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.mode, true) +test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) .include ../../common.testscript diff --git a/tests/cc/modules/common.testscript b/tests/cc/modules/common.testscript index cb567a3..2fbb9a5 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.mode, true) +test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) .include ../../common.testscript diff --git a/tests/cc/preprocessed/testscript b/tests/cc/preprocessed/testscript index 1c6dc76..269cafe 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.mode, true) update +test.arguments = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) update .include ../../common.testscript diff --git a/tests/dependency/recipe/testscript b/tests/dependency/recipe/testscript index 43ec514..09a38ad 100644 --- a/tests/dependency/recipe/testscript +++ b/tests/dependency/recipe/testscript @@ -657,7 +657,7 @@ EOE : process-path-ex : { - config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.mode, true) + config_cxx = config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true) mkdir build; cat <<EOI >=build/bootstrap.build; |