From ef7cb7ea3e6fcb21a4fcf38602b3f43f03232ace Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 1 Dec 2016 17:08:31 +0200 Subject: Implement testscript variable-if Now a variable-only if is treated the same as a single variable when deciding whether it is part of a test or setup/teardown. --- tests/common.test | 2 +- tests/function/path/testscript | 2 +- tests/test/common.test | 2 +- tests/test/script/runner/status.test | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/common.test b/tests/common.test index 4d4520f..a35d0f8 100644 --- a/tests/common.test +++ b/tests/common.test @@ -16,6 +16,6 @@ test.options += -q --buildfile - # By default just load the buildfile. # -+if ($empty($test.arguments)) +if ($empty($test.arguments)) test.arguments = noop end diff --git a/tests/function/path/testscript b/tests/function/path/testscript index e1f0a36..066a6c8 100644 --- a/tests/function/path/testscript +++ b/tests/function/path/testscript @@ -4,7 +4,7 @@ .include ../../common.test -+if ($cxx.target.class != windows) # @@ TMP ternarry +if ($cxx.target.class != windows) # @@ TMP ternarry s = '/' else s = '\' diff --git a/tests/test/common.test b/tests/test/common.test index 9477359..386b16c 100644 --- a/tests/test/common.test +++ b/tests/test/common.test @@ -19,6 +19,6 @@ test.options += -q --buildfile - # By default perform test. # -+if ($empty($test.arguments)) +if ($empty($test.arguments)) test.arguments = test end diff --git a/tests/test/script/runner/status.test b/tests/test/script/runner/status.test index cf4ce1d..f743518 100644 --- a/tests/test/script/runner/status.test +++ b/tests/test/script/runner/status.test @@ -6,7 +6,7 @@ b += --no-column -+if ($cxx.target.class == "windows") +if ($cxx.target.class == "windows") ext = ".exe" end -- cgit v1.1