aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-02-17 11:55:10 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2021-02-17 22:59:54 +0200
commita5b33db55807a9663944d29720ce01eeb26a8bd1 (patch)
tree492e5d8fa4a9e35f57ed09fd966fbfb087f97602
parent92134bac8de3aba4475a7ab5266a9c7d61439d7f (diff)
downloadmeson-a5b33db55807a9663944d29720ce01eeb26a8bd1.zip
meson-a5b33db55807a9663944d29720ce01eeb26a8bd1.tar.gz
meson-a5b33db55807a9663944d29720ce01eeb26a8bd1.tar.bz2
ci: Fix failure in unit tests with vs backend
-rwxr-xr-xrun_unittests.py2
-rw-r--r--test cases/common/52 run target/meson.build4
2 files changed, 3 insertions, 3 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 16589f8..550fe36 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -2382,7 +2382,7 @@ class AllPlatformTests(BasePlatformTests):
self.init(testdir)
self.run_target('check_exists')
self.run_target('check-env')
- self.run_target('dummy.stamp')
+ self.run_target('check-env-ct')
def test_install_introspection(self):
'''
diff --git a/test cases/common/52 run target/meson.build b/test cases/common/52 run target/meson.build
index 9b62f16..df0a1a5 100644
--- a/test cases/common/52 run target/meson.build
+++ b/test cases/common/52 run target/meson.build
@@ -93,7 +93,7 @@ run_target('check-env',
# Check some string substitutions that has always been done but never documented.
# Some projects have been relying on this implementation detail. This is
# documented behaviour since 0.57.1.
-custom_target('dummy.stamp',
+custom_target('check-env-ct',
command: [find_program('check-env.py'), '@SOURCE_ROOT@', '@BUILD_ROOT@',
'@CURRENT_SOURCE_DIR@'],
env: {'MESON_SOURCE_ROOT': meson.source_root(),
@@ -101,5 +101,5 @@ custom_target('dummy.stamp',
'MESON_SUBDIR': meson.current_source_dir(),
'MESONINTROSPECT': 'fake value',
'MY_ENV': '1'},
- output: 'dummy.stamp',
+ output: 'check-env-ct',
)