From 51ab0a979c5c53defd5eda9fa997b2abfd0d4f7d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 16 Jul 2020 09:05:04 +0200 Subject: 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. --- tests/cc/libu/testscript | 2 +- tests/cc/modules/common.testscript | 2 +- tests/cc/preprocessed/testscript | 2 +- tests/dependency/recipe/testscript | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') 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 <=build/bootstrap.build; -- cgit v1.1