aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
Diffstat (limited to 'test cases')
-rw-r--r--test cases/common/187 find override/otherdir/meson.build2
-rw-r--r--test cases/common/194 check header/meson.build10
-rw-r--r--test cases/common/203 function attributes/meson.build2
-rw-r--r--test cases/common/218 dependency get_variable method/meson.build14
-rw-r--r--test cases/common/34 has header/meson.build10
-rw-r--r--test cases/common/62 install subdir/installed_files.txt2
-rw-r--r--test cases/common/62 install subdir/nested_elided/sub/dircheck/ninth.dat (renamed from test cases/common/62 install subdir/nested_elided/sub/dircheck/nineth.dat)0
-rw-r--r--test cases/unit/65 cmake parser/meson.build2
8 files changed, 21 insertions, 21 deletions
diff --git a/test cases/common/187 find override/otherdir/meson.build b/test cases/common/187 find override/otherdir/meson.build
index dc41f5b..5cefc88 100644
--- a/test cases/common/187 find override/otherdir/meson.build
+++ b/test cases/common/187 find override/otherdir/meson.build
@@ -10,7 +10,7 @@ e = executable('six', 'main.c', src)
test('six', e)
-# The same again, but this time with a program that was genererated
+# The same again, but this time with a program that was generated
# with configure_file.
gen = find_program('gencodegen')
diff --git a/test cases/common/194 check header/meson.build b/test cases/common/194 check header/meson.build
index f2f7fa5..98b395d 100644
--- a/test cases/common/194 check header/meson.build
+++ b/test cases/common/194 check header/meson.build
@@ -2,11 +2,11 @@ project('check header', 'c', 'cpp')
host_system = host_machine.system()
-non_existant_header = 'ouagadougou.h'
+non_existent_header = 'ouagadougou.h'
# Copy it into the builddir to ensure that it isn't found even if it's there
-configure_file(input : non_existant_header,
- output : non_existant_header,
+configure_file(input : non_existent_header,
+ output : non_existent_header,
copy: true)
fallback = ''
@@ -43,6 +43,6 @@ foreach comp : [meson.get_compiler('c'), meson.get_compiler('cpp')]
# This header exists in the source and the builddir, but we still must not
# find it since we are looking in the system directories.
- assert(not comp.check_header(non_existant_header, prefix : fallback),
- 'Found non-existant header.')
+ assert(not comp.check_header(non_existent_header, prefix : fallback),
+ 'Found non-existent header.')
endforeach
diff --git a/test cases/common/203 function attributes/meson.build b/test cases/common/203 function attributes/meson.build
index 43ed011..69228e6 100644
--- a/test cases/common/203 function attributes/meson.build
+++ b/test cases/common/203 function attributes/meson.build
@@ -20,7 +20,7 @@ c = meson.get_compiler('c')
cpp = meson.get_compiler('cpp')
if c.get_id() == 'pgi'
- error('MESON_SKIP_TEST: PGI supports its own set of features, will need a seperate list for PGI to test it.')
+ error('MESON_SKIP_TEST: PGI supports its own set of features, will need a separate list for PGI to test it.')
endif
expected_result = not ['msvc', 'clang-cl', 'intel-cl'].contains(c.get_id())
diff --git a/test cases/common/218 dependency get_variable method/meson.build b/test cases/common/218 dependency get_variable method/meson.build
index 92b8704..72e65ee 100644
--- a/test cases/common/218 dependency get_variable method/meson.build
+++ b/test cases/common/218 dependency get_variable method/meson.build
@@ -8,7 +8,7 @@ default = 'asufoiqwjtl;adjfbpiuqwoehtl;ajdfl;ghal;sdjg'
dep = dependency('zlib', method: 'pkg-config', required : false)
if not dep.found()
- warning('Skipping pkg-config tests as zlib is not avialable or is not pkg-config')
+ warning('Skipping pkg-config tests as zlib is not available or is not pkg-config')
else
# Test for regular pkg-config
# We don't know what the value will be, but we know it should be the same
@@ -16,9 +16,9 @@ else
assert(dep.get_pkgconfig_variable('prefix') == dep.get_variable(pkgconfig : 'prefix'),
'Got different values from get_pkgconfig_variable and get_variable(pkgconfig: )')
assert(dep.get_variable(pkgconfig : default, default_value : default) == default,
- 'pkg-config didnt get default when we should have.')
+ 'pkg-config didn\'t get default when we should have.')
assert(dep.get_variable(pkgconfig : 'prefix', default_value : default) != default,
- 'pkg-config got default when we shouldnt have.')
+ 'pkg-config got default when we shouldn\'t have.')
endif
dep_ct = dependency('llvm', method : 'config-tool', required : false)
@@ -28,9 +28,9 @@ else
assert(dep_ct.get_configtool_variable('has-rtti') == dep_ct.get_variable(configtool : 'has-rtti'),
'Got different values from get_configtool_variable and get_variable(configtool: )')
assert(dep_ct.get_variable(configtool : default, default_value : default) == default,
- 'config-tool didnt get default when we should have.')
+ 'config-tool didn\'t get default when we should have.')
assert(dep_ct.get_variable(configtool : 'has-rtti', default_value : default) != default,
- 'config-tool got default when we shouldnt have.')
+ 'config-tool got default when we shouldn\'t have.')
endif
dep_cm = dependency('llvm', method : 'cmake', required : false)
@@ -42,9 +42,9 @@ else
'RTTI information for cmake and config tools disagree')
endif
assert(dep_cm.get_variable(cmake : default, default_value : default) == default,
- 'cmake didnt get default when we should have.')
+ 'cmake didn\'t get default when we should have.')
assert(dep_cm.get_variable(cmake : 'LLVM_ENABLE_RTTI', default_value : default) != default,
- 'cmake config-tool got default when we shouldnt have.')
+ 'cmake config-tool got default when we shouldn\'t have.')
endif
idep = declare_dependency()
diff --git a/test cases/common/34 has header/meson.build b/test cases/common/34 has header/meson.build
index b53849c..8096763 100644
--- a/test cases/common/34 has header/meson.build
+++ b/test cases/common/34 has header/meson.build
@@ -2,11 +2,11 @@ project('has header', 'c', 'cpp')
host_system = host_machine.system()
-non_existant_header = 'ouagadougou.h'
+non_existent_header = 'ouagadougou.h'
# Copy it into the builddir to ensure that it isn't found even if it's there
-configure_file(input : non_existant_header,
- output : non_existant_header,
+configure_file(input : non_existent_header,
+ output : non_existent_header,
configuration : configuration_data())
# Test that the fallback to __has_include also works on all compilers
@@ -48,7 +48,7 @@ foreach fallback : fallbacks
# This header exists in the source and the builddir, but we still must not
# find it since we are looking in the system directories.
- assert(not comp.has_header(non_existant_header, prefix : fallback),
- 'Found non-existant header.')
+ assert(not comp.has_header(non_existent_header, prefix : fallback),
+ 'Found non-existent header.')
endforeach
endforeach
diff --git a/test cases/common/62 install subdir/installed_files.txt b/test cases/common/62 install subdir/installed_files.txt
index 3f561d5..ffcaa69 100644
--- a/test cases/common/62 install subdir/installed_files.txt
+++ b/test cases/common/62 install subdir/installed_files.txt
@@ -1,6 +1,6 @@
usr/share/dircheck/fifth.dat
usr/share/dircheck/seventh.dat
-usr/share/dircheck/nineth.dat
+usr/share/dircheck/ninth.dat
usr/share/eighth.dat
usr/share/fourth.dat
usr/share/sixth.dat
diff --git a/test cases/common/62 install subdir/nested_elided/sub/dircheck/nineth.dat b/test cases/common/62 install subdir/nested_elided/sub/dircheck/ninth.dat
index c4eaca7..c4eaca7 100644
--- a/test cases/common/62 install subdir/nested_elided/sub/dircheck/nineth.dat
+++ b/test cases/common/62 install subdir/nested_elided/sub/dircheck/ninth.dat
diff --git a/test cases/unit/65 cmake parser/meson.build b/test cases/unit/65 cmake parser/meson.build
index 62b9124..061bab0 100644
--- a/test cases/unit/65 cmake parser/meson.build
+++ b/test cases/unit/65 cmake parser/meson.build
@@ -15,5 +15,5 @@ assert(dep.get_variable(cmake : 'CACHED_STRING_WS') == 'foo bar', 'set(CACHED ST
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')
-# We don't suppor this, so it should be unset.
+# We don't support 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