aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@iki.fi>2017-09-01 01:47:41 +0300
committerHemmo Nieminen <hemmo.nieminen@iki.fi>2017-09-01 01:47:41 +0300
commit64950bd318787648c6753a1290c52f627c0e45a3 (patch)
tree7f7b9e9369f20520d5d6efa127d5001994a91133
parentfa572956239409ba72ce163aee3a99dff13990e2 (diff)
downloadmeson-64950bd318787648c6753a1290c52f627c0e45a3.zip
meson-64950bd318787648c6753a1290c52f627c0e45a3.tar.gz
meson-64950bd318787648c6753a1290c52f627c0e45a3.tar.bz2
Add a regression test for test suites.
Ensure test setup environment variables can from now on be given also as strings.
-rwxr-xr-xrun_unittests.py2
-rw-r--r--test cases/unit/2 testsetups/meson.build2
2 files changed, 4 insertions, 0 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 1fb1b4b..f33824a 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -813,6 +813,8 @@ class AllPlatformTests(BasePlatformTests):
self._run(self.mtest_command + ['--setup=empty'])
# Setup with only env works
self._run(self.mtest_command + ['--setup=onlyenv'])
+ self._run(self.mtest_command + ['--setup=onlyenv2'])
+ self._run(self.mtest_command + ['--setup=onlyenv3'])
# Setup with only a timeout works
self._run(self.mtest_command + ['--setup=timeout'])
diff --git a/test cases/unit/2 testsetups/meson.build b/test cases/unit/2 testsetups/meson.build
index 488cf21..58b099d 100644
--- a/test cases/unit/2 testsetups/meson.build
+++ b/test cases/unit/2 testsetups/meson.build
@@ -16,5 +16,7 @@ test('Test buggy', buggy)
add_test_setup('empty')
add_test_setup('onlyenv', env : env)
+add_test_setup('onlyenv2', env : 'TEST_ENV=1')
+add_test_setup('onlyenv3', env : ['TEST_ENV=1'])
add_test_setup('wrapper', exe_wrapper : [vg, '--error-exitcode=1'])
add_test_setup('timeout', timeout_multiplier : 20)