aboutsummaryrefslogtreecommitdiff
path: root/test cases/unit
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-05-29 10:19:34 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-05-29 11:25:27 -0700
commit99b848f469671f43b3ec6b1de333d7154d0d59ea (patch)
treee34af6e70025425f1dbf1d08d37756bf05c52df2 /test cases/unit
parent2e2c3c968c02c3d8e87aa9e1547a842cd793f045 (diff)
downloadmeson-99b848f469671f43b3ec6b1de333d7154d0d59ea.zip
meson-99b848f469671f43b3ec6b1de333d7154d0d59ea.tar.gz
meson-99b848f469671f43b3ec6b1de333d7154d0d59ea.tar.bz2
dependencies/cmake: correctly handle spaces in variable names
Diffstat (limited to 'test cases/unit')
-rw-r--r--test cases/unit/61 cmake parser/meson.build8
1 files changed, 4 insertions, 4 deletions
diff --git a/test cases/unit/61 cmake parser/meson.build b/test cases/unit/61 cmake parser/meson.build
index 1ca8387..62b9124 100644
--- a/test cases/unit/61 cmake parser/meson.build
+++ b/test cases/unit/61 cmake parser/meson.build
@@ -4,16 +4,16 @@ dep = dependency('mesontest')
# Test a bunch of variations of the set() command
assert(dep.get_variable(cmake : 'VAR_WITHOUT_SPACES') == 'NoSpaces', 'set() without spaces incorrect')
-#assert(dep.get_variable(cmake : 'VAR_WITH_SPACES') == 'With Spaces', 'set() with spaces incorrect')
+assert(dep.get_variable(cmake : 'VAR_WITH_SPACES') == 'With Spaces', 'set() with spaces incorrect')
assert(dep.get_variable(cmake : 'VAR_WITHOUT_SPACES_PS') == 'NoSpaces', 'set(PARENT_SCOPE) without spaces incorrect')
-#assert(dep.get_variable(cmake : 'VAR_WITH_SPACES_PS') == 'With Spaces', 'set(PARENT_SCOPE) with spaces incorrect')
+assert(dep.get_variable(cmake : 'VAR_WITH_SPACES_PS') == 'With Spaces', 'set(PARENT_SCOPE) with spaces incorrect')
assert(dep.get_variable(cmake : 'VAR_THAT_IS_UNSET', default_value : 'sentinal') == 'sentinal', 'set() to unset is incorrect')
assert(dep.get_variable(cmake : 'CACHED_STRING_NS') == 'foo', 'set(CACHED) without spaces is incorrect')
-#assert(dep.get_variable(cmake : 'CACHED_STRING_WS') == 'foo bar', 'set(CACHED STRING) with spaces is incorrect')
+assert(dep.get_variable(cmake : 'CACHED_STRING_WS') == 'foo bar', 'set(CACHED STRING) with spaces is incorrect')
assert(dep.get_variable(cmake : 'CACHED_STRING_ARRAY_NS') == ['foo', 'bar'], 'set(CACHED STRING) without spaces is incorrect')
-#assert(dep.get_variable(cmake : 'CACHED_STRING_ARRAY_WS') == ['foo', 'foo bar', 'bar'], 'set(CACHED STRING[]) with spaces is incorrect')
+assert(dep.get_variable(cmake : 'CACHED_STRING_ARRAY_WS') == ['foo', 'foo bar', 'bar'], 'set(CACHED STRING[]) with spaces is incorrect')
# We don't suppor this, so it should be unset.
assert(dep.get_variable(cmake : 'ENV{var}', default_value : 'sentinal') == 'sentinal', 'set(ENV) should be ignored') \ No newline at end of file