From 8283e34747d6409124517a217bb19354311030b2 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 19 Aug 2019 23:07:04 +0300 Subject: Make testscripts to ignore user's default options files --- tests/test/common.testscript | 2 +- tests/test/config-test/testscript | 2 +- tests/test/script/common.testscript | 2 +- tests/test/script/runner/redirect.testscript | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/test') diff --git a/tests/test/common.testscript b/tests/test/common.testscript index 0b82849..722f426 100644 --- a/tests/test/common.testscript +++ b/tests/test/common.testscript @@ -20,7 +20,7 @@ if ($null($test.options)) test.options = --buildfile - end -test.options += --serial-stop --quiet +test.options += --no-default-options --serial-stop --quiet # By default perform test. # diff --git a/tests/test/config-test/testscript b/tests/test/config-test/testscript index 996ddd3..1dabfeb 100644 --- a/tests/test/config-test/testscript +++ b/tests/test/config-test/testscript @@ -5,7 +5,7 @@ # Setup a realistic test project that we will then exercise. # -test.options = --serial-stop --quiet +test.options = --no-default-options --serial-stop --quiet test.arguments = 'test(../proj/@./)' # Test out-of-src (for parallel). test.cleanups = &?**/ # Cleanup out directory structure. diff --git a/tests/test/script/common.testscript b/tests/test/script/common.testscript index d51268a..47af7a1 100644 --- a/tests/test/script/common.testscript +++ b/tests/test/script/common.testscript @@ -32,6 +32,6 @@ end # automatically becoming dir{./}'s prerequisite. # c = cat >=testscript -b = $0 --serial-stop --quiet --buildfile - test \ +b = $0 --no-default-options --serial-stop --quiet --buildfile - test \ <"'testscript{testscript}: \$target'" \ &?test/*** diff --git a/tests/test/script/runner/redirect.testscript b/tests/test/script/runner/redirect.testscript index dfec2fd..e3cc0d8 100644 --- a/tests/test/script/runner/redirect.testscript +++ b/tests/test/script/runner/redirect.testscript @@ -16,7 +16,7 @@ psr = ($cxx.target.class != 'windows' ? '/' : '\\') # Path separator in regex. cat <=buildfile; testscript{testscript}: $target EOI - $0 --serial-stop --quiet test foo 2>bar + $0 --no-default-options --serial-stop --quiet test foo 2>bar } : null -- cgit v1.1