summaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorJosh Soref <2119212+jsoref@users.noreply.github.com>2023-04-11 16:04:17 -0400
committerEli Schwartz <eschwartz93@gmail.com>2023-04-11 19:21:05 -0400
commitcf9fd56bc905a2022ad48c93d25b5a73b57c8802 (patch)
treea6858f0e790f801f49d8d4f161e9183deaf90e20 /test cases
parente238b81ba0b89faa19b512d1e78de00dad1488ce (diff)
downloadmeson-cf9fd56bc905a2022ad48c93d25b5a73b57c8802.tar.gz
fix various spelling issues
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Diffstat (limited to 'test cases')
-rw-r--r--test cases/cmake/9 disabled subproject/meson.build2
-rw-r--r--test cases/common/14 configure file/meson.build2
-rw-r--r--test cases/common/158 disabler/meson.build2
-rw-r--r--test cases/common/182 find override/meson.build2
-rw-r--r--test cases/common/189 check header/meson.build2
-rw-r--r--test cases/common/196 subproject with features/meson.build2
-rw-r--r--test cases/common/20 global arg/prog.c2
-rw-r--r--test cases/common/220 fs module/meson.build2
-rw-r--r--test cases/common/222 native prop/meson.build8
-rwxr-xr-xtest cases/common/227 very long command line/codegen.py (renamed from test cases/common/227 very long commmand line/codegen.py)0
-rw-r--r--test cases/common/227 very long command line/main.c (renamed from test cases/common/227 very long commmand line/main.c)0
-rw-r--r--test cases/common/227 very long command line/meson.build (renamed from test cases/common/227 very long commmand line/meson.build)2
-rwxr-xr-xtest cases/common/227 very long command line/name_gen.py (renamed from test cases/common/227 very long commmand line/name_gen.py)0
-rw-r--r--test cases/common/235 invalid standard overridden to valid/main.c (renamed from test cases/common/235 invalid standard overriden to valid/main.c)0
-rw-r--r--test cases/common/235 invalid standard overridden to valid/meson.build (renamed from test cases/common/235 invalid standard overriden to valid/meson.build)0
-rw-r--r--test cases/common/235 invalid standard overridden to valid/test.json (renamed from test cases/common/235 invalid standard overriden to valid/test.json)0
-rw-r--r--test cases/common/26 find program/meson.build2
-rw-r--r--test cases/common/27 multiline string/meson.build2
-rw-r--r--test cases/common/32 has header/meson.build2
-rw-r--r--test cases/common/36 has function/meson.build4
-rw-r--r--test cases/common/40 options/meson_options.txt2
-rw-r--r--test cases/common/42 subproject/meson.build2
-rw-r--r--test cases/common/56 array methods/meson.build2
-rw-r--r--test cases/common/98 subproject subdir/meson.build2
-rw-r--r--test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build2
-rw-r--r--test cases/failing/129 generator host binary/meson.build2
-rw-r--r--test cases/failing/3 missing subdir/test.json2
-rw-r--r--test cases/failing/4 missing meson.build/test.json2
-rw-r--r--test cases/failing/59 bad option argument/meson_options.txt2
-rw-r--r--test cases/failing/59 bad option argument/test.json2
-rw-r--r--test cases/failing/70 override used/meson.build2
-rw-r--r--test cases/failing/75 non-ascii in ascii encoded configure file/config9.h.in (renamed from test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in)0
-rw-r--r--test cases/failing/75 non-ascii in ascii encoded configure file/meson.build (renamed from test cases/failing/75 non ascii in ascii encoded configure file/meson.build)4
-rw-r--r--test cases/failing/75 non-ascii in ascii encoded configure file/test.json (renamed from test cases/failing/75 non ascii in ascii encoded configure file/test.json)2
-rw-r--r--test cases/failing/83 dub library/meson.build (renamed from test cases/failing/83 dub libray/meson.build)0
-rw-r--r--test cases/failing/83 dub library/test.json7
-rw-r--r--test cases/failing/83 dub libray/test.json7
-rw-r--r--test cases/frameworks/1 boost/meson.build2
-rw-r--r--test cases/frameworks/21 libwmf/meson.build2
-rw-r--r--test cases/frameworks/25 hdf5/meson.build2
-rw-r--r--test cases/frameworks/4 qt/meson.build2
-rw-r--r--test cases/frameworks/4 qt/subfolder/meson.build2
-rwxr-xr-xtest cases/frameworks/7 gnome/gir/copy.py2
-rw-r--r--test cases/frameworks/7 gnome/gir/meson.build2
-rw-r--r--test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake2
-rw-r--r--test cases/linuxlike/13 cmake dependency/test.json2
-rw-r--r--test cases/linuxlike/5 dependency versions/meson.build2
-rw-r--r--test cases/native/2 global arg/prog.c2
-rw-r--r--test cases/python/6 failing subproject/subprojects/bar/meson.build2
-rw-r--r--test cases/rust/19 structured sources/meson.build2
-rw-r--r--test cases/rust/9 unit tests/test2.rs4
-rw-r--r--test cases/unit/63 cmake parser/meson.build4
-rw-r--r--test cases/unit/77 nostdlib/subprojects/mylibc/libc.c2
-rw-r--r--test cases/unit/87 run native test/meson.build2
-rw-r--r--test cases/unit/98 link full name/proguser/receiver.c4
55 files changed, 60 insertions, 60 deletions
diff --git a/test cases/cmake/9 disabled subproject/meson.build b/test cases/cmake/9 disabled subproject/meson.build
index c153fa3a3..b22f9599c 100644
--- a/test cases/cmake/9 disabled subproject/meson.build
+++ b/test cases/cmake/9 disabled subproject/meson.build
@@ -2,5 +2,5 @@ project('cmakeSubTest', ['c', 'cpp'])
cm = import('cmake')
-sub_pro = cm.subproject('nothinig', required: false)
+sub_pro = cm.subproject('nothing', required: false)
assert(not sub_pro.found(), 'subproject found() reports wrong value')
diff --git a/test cases/common/14 configure file/meson.build b/test cases/common/14 configure file/meson.build
index 569dd09b7..90a468f5e 100644
--- a/test cases/common/14 configure file/meson.build
+++ b/test cases/common/14 configure file/meson.build
@@ -161,7 +161,7 @@ cfile = configure_file(input : 'config.h.in',
install_dir : false,
configuration : conf)
-# test intsall_dir with install: false
+# test install_dir with install: false
cfile = configure_file(input : 'config.h.in',
output : 'do_not_get_installed_in_install_dir.h',
install : false,
diff --git a/test cases/common/158 disabler/meson.build b/test cases/common/158 disabler/meson.build
index d132e2b52..65ca5fdf5 100644
--- a/test cases/common/158 disabler/meson.build
+++ b/test cases/common/158 disabler/meson.build
@@ -97,7 +97,7 @@ assert(if_is_not_disabled, 'Disabler in is_variable should not skip blocks')
get_d = get_variable('d6')
assert(is_disabler(get_d), 'get_variable should yield a disabler')
-get_fallback_d = get_variable('nonexistant', disabler())
+get_fallback_d = get_variable('nonexistent', disabler())
assert(is_disabler(get_fallback_d), 'get_variable fallback should yield a disabler')
var_true = true
diff --git a/test cases/common/182 find override/meson.build b/test cases/common/182 find override/meson.build
index 8dcbac76b..f21700140 100644
--- a/test cases/common/182 find override/meson.build
+++ b/test cases/common/182 find override/meson.build
@@ -18,7 +18,7 @@ assert(tool.found())
assert(tool.full_path() != '')
assert(tool.full_path() == tool.path())
-# six_meson_exe is an overritten project executable
+# six_meson_exe is an overridden project executable
six_prog = find_program('six_meson_exe')
assert(six_prog.found())
assert(six_prog.full_path() != '')
diff --git a/test cases/common/189 check header/meson.build b/test cases/common/189 check header/meson.build
index 98b395de5..1d3eb45df 100644
--- a/test cases/common/189 check header/meson.build
+++ b/test cases/common/189 check header/meson.build
@@ -44,5 +44,5 @@ 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_existent_header, prefix : fallback),
- 'Found non-existent header.')
+ 'Found nonexistent header.')
endforeach
diff --git a/test cases/common/196 subproject with features/meson.build b/test cases/common/196 subproject with features/meson.build
index 5bdfefbc0..130c69a07 100644
--- a/test cases/common/196 subproject with features/meson.build
+++ b/test cases/common/196 subproject with features/meson.build
@@ -10,7 +10,7 @@ disabled_subproj = subproject('disabled_sub', required: get_option('disabled-sub
assert(disabled_subproj.found() == false, 'Disabled subproject should be NOT found')
disabled_dep = dependency('', fallback: ['disabled_sub', 'libSub'], required: false)
-assert(disabled_dep.found() == false, 'Subprojetc was disabled, it should never be built.')
+assert(disabled_dep.found() == false, 'Subproject was disabled, it should never be built.')
nothing = executable('nothing', 'nothing.c', dependencies: [disabled_dep])
subproj_with_missing_dep = subproject('auto_sub_with_missing_dep', required: get_option('auto-sub-with-missing-dep'))
diff --git a/test cases/common/20 global arg/prog.c b/test cases/common/20 global arg/prog.c
index 2a71236b6..c70a669f6 100644
--- a/test cases/common/20 global arg/prog.c
+++ b/test cases/common/20 global arg/prog.c
@@ -11,7 +11,7 @@
#endif
#if !defined(GLOBAL_HOST) && !defined(GLOBAL_BUILD)
- #error "Neither global_host nor glogal_build is set."
+ #error "Neither global_host nor global_build is set."
#endif
#if defined(GLOBAL_HOST) && defined(GLOBAL_BUILD)
diff --git a/test cases/common/220 fs module/meson.build b/test cases/common/220 fs module/meson.build
index d38c87232..a1e9c44fc 100644
--- a/test cases/common/220 fs module/meson.build
+++ b/test cases/common/220 fs module/meson.build
@@ -120,7 +120,7 @@ assert(not fs.is_samepath(f1, 'subdir/subdirfile.txt'), 'is_samepath known bad c
assert(not fs.is_samepath('not-a-path', f2), 'is_samepath should not error if path(s) do not exist')
f = files('meson.build', 'subdir/../meson.build')
-assert(fs.is_samepath(f[0], f[1]), 'is_samepath not detercting same files')
+assert(fs.is_samepath(f[0], f[1]), 'is_samepath not detecting same files')
if not is_windows and build_machine.system() != 'cygwin'
assert(fs.is_samepath(symlink, 'meson.build'), 'symlink is_samepath fail')
diff --git a/test cases/common/222 native prop/meson.build b/test cases/common/222 native prop/meson.build
index 87523719e..88e32ec20 100644
--- a/test cases/common/222 native prop/meson.build
+++ b/test cases/common/222 native prop/meson.build
@@ -8,16 +8,16 @@ x = meson.get_external_property('astring', native: true)
assert(x=='mystring', 'did not get native property with native:true and non-cross build.')
x = meson.get_external_property('astring', 'fallback', native: false)
-assert(x==ref, 'did not get get native property with native:false and non-cross build.')
+assert(x==ref, 'did not get native property with native:false and non-cross build.')
-x = meson.get_external_property('notexist', 'fallback')
+x = meson.get_external_property('nonexistent', 'fallback')
assert(x=='fallback', 'fallback did not work')
-x = meson.get_external_property('notexist', 'fallback', native: true)
+x = meson.get_external_property('nonexistent', 'fallback', native: true)
assert(x=='fallback', 'fallback native:true did not work')
-x = meson.get_external_property('notexist', 'fallback', native: false)
+x = meson.get_external_property('nonexistent', 'fallback', native: false)
assert(x=='fallback', 'fallback native:false did not work')
diff --git a/test cases/common/227 very long commmand line/codegen.py b/test cases/common/227 very long command line/codegen.py
index b1de6073e..b1de6073e 100755
--- a/test cases/common/227 very long commmand line/codegen.py
+++ b/test cases/common/227 very long command line/codegen.py
diff --git a/test cases/common/227 very long commmand line/main.c b/test cases/common/227 very long command line/main.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/227 very long commmand line/main.c
+++ b/test cases/common/227 very long command line/main.c
diff --git a/test cases/common/227 very long commmand line/meson.build b/test cases/common/227 very long command line/meson.build
index f8df3115b..e4661b0af 100644
--- a/test cases/common/227 very long commmand line/meson.build
+++ b/test cases/common/227 very long command line/meson.build
@@ -8,7 +8,7 @@ if build_machine.system() == 'windows'
limit = 32767
# NOTE: filename limit is 260 characters unless
# 1. Python >= 3.6 is being used
- # 2. Windows 10 registry has been edited to enable long pathnaems
+ # 2. Windows 10 registry has been edited to enable long pathnames
# ninja backend uses absolute filenames, so we ensure they don't exceed 260.
elif build_machine.system() == 'cygwin'
# cygwin-to-win32: see above
diff --git a/test cases/common/227 very long commmand line/name_gen.py b/test cases/common/227 very long command line/name_gen.py
index 84352984a..84352984a 100755
--- a/test cases/common/227 very long commmand line/name_gen.py
+++ b/test cases/common/227 very long command line/name_gen.py
diff --git a/test cases/common/235 invalid standard overriden to valid/main.c b/test cases/common/235 invalid standard overridden to valid/main.c
index 9b6bdc2ec..9b6bdc2ec 100644
--- a/test cases/common/235 invalid standard overriden to valid/main.c
+++ b/test cases/common/235 invalid standard overridden to valid/main.c
diff --git a/test cases/common/235 invalid standard overriden to valid/meson.build b/test cases/common/235 invalid standard overridden to valid/meson.build
index 6dc320152..6dc320152 100644
--- a/test cases/common/235 invalid standard overriden to valid/meson.build
+++ b/test cases/common/235 invalid standard overridden to valid/meson.build
diff --git a/test cases/common/235 invalid standard overriden to valid/test.json b/test cases/common/235 invalid standard overridden to valid/test.json
index c9b00ce19..c9b00ce19 100644
--- a/test cases/common/235 invalid standard overriden to valid/test.json
+++ b/test cases/common/235 invalid standard overridden to valid/test.json
diff --git a/test cases/common/26 find program/meson.build b/test cases/common/26 find program/meson.build
index 5d38d0b36..3c4d15cda 100644
--- a/test cases/common/26 find program/meson.build
+++ b/test cases/common/26 find program/meson.build
@@ -35,5 +35,5 @@ assert(prog.found(), 'Program version should match')
prog = find_program('test_subdir.py', required : false)
assert(not prog.found(), 'Program should not be found')
-prog = find_program('test_subdir.py', dirs : ['/donotexist', meson.current_source_dir() / 'scripts'])
+prog = find_program('test_subdir.py', dirs : ['/nonexistent', meson.current_source_dir() / 'scripts'])
assert(prog.found(), 'Program should be found')
diff --git a/test cases/common/27 multiline string/meson.build b/test cases/common/27 multiline string/meson.build
index a87d29ad9..39d2438d0 100644
--- a/test cases/common/27 multiline string/meson.build
+++ b/test cases/common/27 multiline string/meson.build
@@ -34,4 +34,4 @@ int main(void) {
return 0;
}'''
-assert(cc.compiles(prog), 'multline test compile failed')
+assert(cc.compiles(prog), 'multiline test compile failed')
diff --git a/test cases/common/32 has header/meson.build b/test cases/common/32 has header/meson.build
index 8096763a9..e6f6efb81 100644
--- a/test cases/common/32 has header/meson.build
+++ b/test cases/common/32 has header/meson.build
@@ -49,6 +49,6 @@ 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_existent_header, prefix : fallback),
- 'Found non-existent header.')
+ 'Found nonexistent header.')
endforeach
endforeach
diff --git a/test cases/common/36 has function/meson.build b/test cases/common/36 has function/meson.build
index a3f0a3c9d..bb3e86976 100644
--- a/test cases/common/36 has function/meson.build
+++ b/test cases/common/36 has function/meson.build
@@ -37,11 +37,11 @@ foreach cc : compilers
if cc.has_function('hfkerhisadf', prefix : '#include<stdio.h>',
args : unit_test_args)
- error('Found non-existent function "hfkerhisadf".')
+ error('Found nonexistent function "hfkerhisadf".')
endif
if cc.has_function('hfkerhisadf', args : unit_test_args)
- error('Found non-existent function "hfkerhisadf".')
+ error('Found nonexistent function "hfkerhisadf".')
endif
# With glibc (before 2.32, see below) on Linux, lchmod is a stub that will
diff --git a/test cases/common/40 options/meson_options.txt b/test cases/common/40 options/meson_options.txt
index ecb024db8..ad48141d6 100644
--- a/test cases/common/40 options/meson_options.txt
+++ b/test cases/common/40 options/meson_options.txt
@@ -5,7 +5,7 @@ option('array_opt', type : 'array', choices : ['one', 'two', 'three'], value : [
option('free_array_opt', type : 'array')
option('integer_opt', type : 'integer', min : 0, max : -(-5), value : 3)
option('neg' + '_' + 'int' + '_' + 'opt', type : 'integer', min : -5, max : 5, value : -3)
-option('CaseSenSiTivE', type : 'string', value: 'Some CAPS', description : 'An option with mixed capitaliziation')
+option('CaseSenSiTivE', type : 'string', value: 'Some CAPS', description : 'An option with mixed capitalization')
option('CASESENSITIVE', type : 'string', value: 'ALL CAPS', description : 'An option with all caps')
option('boolean_string', type : 'boolean', value : 'false')
diff --git a/test cases/common/42 subproject/meson.build b/test cases/common/42 subproject/meson.build
index ae68aa6e2..c2c0122f1 100644
--- a/test cases/common/42 subproject/meson.build
+++ b/test cases/common/42 subproject/meson.build
@@ -26,5 +26,5 @@ meson.install_dependency_manifest('share/sublib/sublib.depmf')
unknown_var = sub.get_variable('does-not-exist', [])
if unknown_var != []
- error ('unexpetced fallback value for subproject.get_variable()')
+ error ('unexpected fallback value for subproject.get_variable()')
endif
diff --git a/test cases/common/56 array methods/meson.build b/test cases/common/56 array methods/meson.build
index d323db8b2..e9e4969c7 100644
--- a/test cases/common/56 array methods/meson.build
+++ b/test cases/common/56 array methods/meson.build
@@ -18,7 +18,7 @@ if not file_list.contains(file_a[0])
endif
if file_list.contains(file_c[0])
- error('Contains with ObjectHolder lists found non existent object')
+ error('Contains with ObjectHolder lists found nonexistent object')
endif
if empty.contains('abc')
diff --git a/test cases/common/98 subproject subdir/meson.build b/test cases/common/98 subproject subdir/meson.build
index 3053b3b91..ef053d86c 100644
--- a/test cases/common/98 subproject subdir/meson.build
+++ b/test cases/common/98 subproject subdir/meson.build
@@ -27,7 +27,7 @@ d = dependency('sub-notfound', fallback : 'sub_novar', required : false)
assert(not d.found(), 'Dependency should be not-found')
# Verify that implicit fallback works because subprojects/sub_implicit directory exists
-d = dependency('sub_implicit', default_options: 'opt=overriden')
+d = dependency('sub_implicit', default_options: 'opt=overridden')
assert(d.found(), 'Should implicitly fallback')
# Verify that implicit fallback works because sub_implicit.wrap has
diff --git a/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build b/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build
index 9f436042f..8002e9bcd 100644
--- a/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build
+++ b/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build
@@ -10,4 +10,4 @@ sub_implicit_provide2_dep = dep
# This one is not overridden but the wrap file tells the variable name to use.
glib_dep = dep
-assert(get_option('opt') == 'overriden') \ No newline at end of file
+assert(get_option('opt') == 'overridden')
diff --git a/test cases/failing/129 generator host binary/meson.build b/test cases/failing/129 generator host binary/meson.build
index fc1f9beb2..e76933878 100644
--- a/test cases/failing/129 generator host binary/meson.build
+++ b/test cases/failing/129 generator host binary/meson.build
@@ -8,7 +8,7 @@ add_languages('c', native : false)
exe = executable('exe', 'exe.c', native : false)
-gen = generator(exe, output : '@BASENAME@.c', arguments : ['@INPUT@', '@OUTPU@'])
+gen = generator(exe, output : '@BASENAME@.c', arguments : ['@INPUT@', '@OUTPUT@'])
foo = gen.process('lib.in')
library('foo', foo)
diff --git a/test cases/failing/3 missing subdir/test.json b/test cases/failing/3 missing subdir/test.json
index 562de2545..e70f6dec3 100644
--- a/test cases/failing/3 missing subdir/test.json
+++ b/test cases/failing/3 missing subdir/test.json
@@ -3,7 +3,7 @@
{
"comment": "'missing/meson.build' gets transformed with os.path.sep separators",
"match": "re",
- "line": "test cases/failing/3 missing subdir/meson\\.build:3:0: ERROR: Non\\-existent build file 'missing[\\\\/]meson\\.build'"
+ "line": "test cases/failing/3 missing subdir/meson\\.build:3:0: ERROR: Nonexistent build file 'missing[\\\\/]meson\\.build'"
}
]
}
diff --git a/test cases/failing/4 missing meson.build/test.json b/test cases/failing/4 missing meson.build/test.json
index 3857090b1..e111087b7 100644
--- a/test cases/failing/4 missing meson.build/test.json
+++ b/test cases/failing/4 missing meson.build/test.json
@@ -3,7 +3,7 @@
{
"match": "re",
"comment": "'subdir/meson.build' gets transformed with os.path.sep separators",
- "line": "test cases/failing/4 missing meson\\.build/meson\\.build:3:0: ERROR: Non\\-existent build file 'subdir[\\\\/]meson\\.build'"
+ "line": "test cases/failing/4 missing meson\\.build/meson\\.build:3:0: ERROR: Nonexistent build file 'subdir[\\\\/]meson\\.build'"
}
]
}
diff --git a/test cases/failing/59 bad option argument/meson_options.txt b/test cases/failing/59 bad option argument/meson_options.txt
index de1fff6fb..0e0372b89 100644
--- a/test cases/failing/59 bad option argument/meson_options.txt
+++ b/test cases/failing/59 bad option argument/meson_options.txt
@@ -1 +1 @@
-option('name', type : 'string', vaule : 'foo')
+option('name', type : 'string', value_ : 'foo')
diff --git a/test cases/failing/59 bad option argument/test.json b/test cases/failing/59 bad option argument/test.json
index 28aa0caba..9d22a9a22 100644
--- a/test cases/failing/59 bad option argument/test.json
+++ b/test cases/failing/59 bad option argument/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/failing/59 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"vaule\""
+ "line": "test cases/failing/59 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
}
]
}
diff --git a/test cases/failing/70 override used/meson.build b/test cases/failing/70 override used/meson.build
index 128108e30..582fc1b05 100644
--- a/test cases/failing/70 override used/meson.build
+++ b/test cases/failing/70 override used/meson.build
@@ -1,4 +1,4 @@
-project('overridde an already found exe')
+project('override an already found exe')
old = find_program('something.py')
replacement = find_program('other.py')
diff --git a/test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in b/test cases/failing/75 non-ascii in ascii encoded configure file/config9.h.in
index 323bec64a..323bec64a 100644
--- a/test cases/failing/75 non ascii in ascii encoded configure file/config9.h.in
+++ b/test cases/failing/75 non-ascii in ascii encoded configure file/config9.h.in
diff --git a/test cases/failing/75 non ascii in ascii encoded configure file/meson.build b/test cases/failing/75 non-ascii in ascii encoded configure file/meson.build
index 26da80eab..eadb627cd 100644
--- a/test cases/failing/75 non ascii in ascii encoded configure file/meson.build
+++ b/test cases/failing/75 non-ascii in ascii encoded configure file/meson.build
@@ -1,5 +1,5 @@
-project('non acsii to ascii encoding')
-# Writing a non ASCII character with a ASCII encoding should fail
+project('non-ascii to ascii encoding')
+# Writing a non-ASCII character with a ASCII encoding should fail
conf9 = configuration_data()
conf9.set('var', 'д')
configure_file(
diff --git a/test cases/failing/75 non ascii in ascii encoded configure file/test.json b/test cases/failing/75 non-ascii in ascii encoded configure file/test.json
index 27cb0ab8d..3d797f923 100644
--- a/test cases/failing/75 non ascii in ascii encoded configure file/test.json
+++ b/test cases/failing/75 non-ascii in ascii encoded configure file/test.json
@@ -2,7 +2,7 @@
"stdout": [
{
"match": "re",
- "line": "test cases/failing/75 non ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
+ "line": "test cases/failing/75 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
}
]
}
diff --git a/test cases/failing/83 dub libray/meson.build b/test cases/failing/83 dub library/meson.build
index 306d5b3e5..306d5b3e5 100644
--- a/test cases/failing/83 dub libray/meson.build
+++ b/test cases/failing/83 dub library/meson.build
diff --git a/test cases/failing/83 dub library/test.json b/test cases/failing/83 dub library/test.json
new file mode 100644
index 000000000..e4248f4f0
--- /dev/null
+++ b/test cases/failing/83 dub library/test.json
@@ -0,0 +1,7 @@
+{
+ "stdout": [
+ {
+ "line": "test cases/failing/83 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+ }
+ ]
+}
diff --git a/test cases/failing/83 dub libray/test.json b/test cases/failing/83 dub libray/test.json
deleted file mode 100644
index 4dcbbedda..000000000
--- a/test cases/failing/83 dub libray/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "stdout": [
- {
- "line": "test cases/failing/83 dub libray/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
- }
- ]
-}
diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build
index 821bb6277..2e22cbf34 100644
--- a/test cases/frameworks/1 boost/meson.build
+++ b/test cases/frameworks/1 boost/meson.build
@@ -17,7 +17,7 @@ linkdep = dependency('boost', static: s, modules : ['thread', 'system', 'dat
testdep = dependency('boost', static: s, modules : ['unit_test_framework'])
nomoddep = dependency('boost', static: s)
extralibdep = dependency('boost', static: s, modules : ['thread', 'system', 'date_time', 'log_setup', 'log', 'filesystem', 'regex'])
-notfound = dependency('boost', static: s, modules : ['this_should_not_exist_on_any_systen'], required: false)
+notfound = dependency('boost', static: s, modules : ['this_should_not_exist_on_any_system'], required: false)
assert(not notfound.found())
diff --git a/test cases/frameworks/21 libwmf/meson.build b/test cases/frameworks/21 libwmf/meson.build
index 9dbab6a86..5892932a7 100644
--- a/test cases/frameworks/21 libwmf/meson.build
+++ b/test cases/frameworks/21 libwmf/meson.build
@@ -10,7 +10,7 @@ libwmf_ver = libwmf_dep.version()
assert(libwmf_ver.split('.').length() > 1, 'libwmf version is "@0@"'.format(libwmf_ver))
message('libwmf version is "@0@"'.format(libwmf_ver))
# Workaround for Debian bug 912563 where libwmf-devel returns cflags
-# that do not not have Freetype include paths but their headers
+# that do not have Freetype include paths but their headers
# use them unconditionally.
ft_dep = dependency('freetype2')
e = executable('libwmf_prog', 'libwmf_prog.c', dependencies : [libwmf_dep, ft_dep])
diff --git a/test cases/frameworks/25 hdf5/meson.build b/test cases/frameworks/25 hdf5/meson.build
index 0df2ffdd4..b9f5784b4 100644
--- a/test cases/frameworks/25 hdf5/meson.build
+++ b/test cases/frameworks/25 hdf5/meson.build
@@ -29,7 +29,7 @@ if test_fortran
# Search paths don't work correctly here and -lgfortran doesn't work
test_fortran = false
elif host_machine.system() == 'windows' and cpp.get_id() != 'gcc' and fc.get_id() == 'gcc'
- # mixing gfotran with non-gcc doesn't work on windows
+ # mixing gfortran with non-gcc doesn't work on windows
test_fortran = false
endif
diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build
index 735b3f9c4..66a4443f3 100644
--- a/test cases/frameworks/4 qt/meson.build
+++ b/test cases/frameworks/4 qt/meson.build
@@ -65,7 +65,7 @@ foreach qt : ['qt4', 'qt5', 'qt6']
extra_cpp_args = []
if meson.is_unity()
extra_cpp_args += '-DUNITY_BUILD'
- prep_rcc = qtmodule.preprocess(qt + '_unity_ressource', qresources : ['stuff.qrc', 'stuff2.qrc'], method : get_option('method'))
+ prep_rcc = qtmodule.preprocess(qt + '_unity_resource', qresources : ['stuff.qrc', 'stuff2.qrc'], method : get_option('method'))
else
prep_rcc = qtmodule.preprocess(qresources : ['stuff.qrc', 'stuff2.qrc'], method : get_option('method'))
endif
diff --git a/test cases/frameworks/4 qt/subfolder/meson.build b/test cases/frameworks/4 qt/subfolder/meson.build
index f1b84e6ae..652d14719 100644
--- a/test cases/frameworks/4 qt/subfolder/meson.build
+++ b/test cases/frameworks/4 qt/subfolder/meson.build
@@ -23,7 +23,7 @@ rc_file = configure_file(
extra_cpp_args = []
if meson.is_unity()
extra_cpp_args += '-DUNITY_BUILD'
- qresources = qtmodule.preprocess(qt + '_subfolder_unity_ressource',qresources : ['resources/stuff3.qrc', rc_file])
+ qresources = qtmodule.preprocess(qt + '_subfolder_unity_resource',qresources : ['resources/stuff3.qrc', rc_file])
else
qresources = qtmodule.preprocess(qresources : ['resources/stuff3.qrc', rc_file])
endif
diff --git a/test cases/frameworks/7 gnome/gir/copy.py b/test cases/frameworks/7 gnome/gir/copy.py
index fa70145b5..e92deaf5d 100755
--- a/test cases/frameworks/7 gnome/gir/copy.py
+++ b/test cases/frameworks/7 gnome/gir/copy.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
# SPDX-License-Identifier: Apache-2.0
-# Copyright © 2021 Intel Corproation
+# Copyright © 2021 Intel Corporation
import argparse
import shutil
diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build
index fbff2060e..f53eca604 100644
--- a/test cases/frameworks/7 gnome/gir/meson.build
+++ b/test cases/frameworks/7 gnome/gir/meson.build
@@ -4,7 +4,7 @@ libsources = ['meson-sample.c', 'meson-sample.h']
lib2sources = ['meson-sample2.c', 'meson-sample2.h']
gen_source = custom_target(
- 'meson_smaple3.h',
+ 'meson_sample3.h',
input : 'meson-sample.h',
output : 'meson-sample3.h',
command : [find_program('copy.py'), '@INPUT@', '@OUTPUT@'],
diff --git a/test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake b/test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake
index 4b3f81479..2d8318ffb 100644
--- a/test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake
+++ b/test cases/linuxlike/13 cmake dependency/cmake_fake1/cmMesonTestF1Config.cmake
@@ -5,7 +5,7 @@ if(ZLIB_FOUND OR ZLIB_Found)
set(cmMesonTestF1_LIBRARIES general ${ZLIB_LIBRARY})
set(cmMesonTestF1_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
- add_library(CMMesonTESTf1::evil_non_standard_trget UNKNOWN IMPORTED)
+ add_library(CMMesonTESTf1::evil_non_standard_target UNKNOWN IMPORTED)
else()
set(cmMesonTestF1_FOUND OFF)
endif()
diff --git a/test cases/linuxlike/13 cmake dependency/test.json b/test cases/linuxlike/13 cmake dependency/test.json
index 1505986ee..484ce202c 100644
--- a/test cases/linuxlike/13 cmake dependency/test.json
+++ b/test cases/linuxlike/13 cmake dependency/test.json
@@ -8,7 +8,7 @@
"line": "WARNING: Could not find and exact match for the CMake dependency cmMesonTestF1."
},
{
- "line": " ['CMMesonTESTf1::evil_non_standard_trget']"
+ "line": " ['CMMesonTESTf1::evil_non_standard_target']"
}
]
}
diff --git a/test cases/linuxlike/5 dependency versions/meson.build b/test cases/linuxlike/5 dependency versions/meson.build
index 164e679c4..4038ee96d 100644
--- a/test cases/linuxlike/5 dependency versions/meson.build
+++ b/test cases/linuxlike/5 dependency versions/meson.build
@@ -82,7 +82,7 @@ assert(fakezlib_dep.type_name() == 'internal', 'fakezlib_dep should be of type "
# Verify that once we got a system dependency, we won't fallback if a newer
# version is requested.
d = dependency('zlib', version: '>= 999',
- fallback : ['donotexist', 'fakezlib_dep'],
+ fallback : ['nonexistent', 'fakezlib_dep'],
required: false)
assert(not d.found(), 'version should not match and it should not fallback')
diff --git a/test cases/native/2 global arg/prog.c b/test cases/native/2 global arg/prog.c
index 2a71236b6..c70a669f6 100644
--- a/test cases/native/2 global arg/prog.c
+++ b/test cases/native/2 global arg/prog.c
@@ -11,7 +11,7 @@
#endif
#if !defined(GLOBAL_HOST) && !defined(GLOBAL_BUILD)
- #error "Neither global_host nor glogal_build is set."
+ #error "Neither global_host nor global_build is set."
#endif
#if defined(GLOBAL_HOST) && defined(GLOBAL_BUILD)
diff --git a/test cases/python/6 failing subproject/subprojects/bar/meson.build b/test cases/python/6 failing subproject/subprojects/bar/meson.build
index 21431cace..a5534ced0 100644
--- a/test cases/python/6 failing subproject/subprojects/bar/meson.build
+++ b/test cases/python/6 failing subproject/subprojects/bar/meson.build
@@ -1,4 +1,4 @@
project('bar', 'cpp')
python = import('python').find_installation('python3')
-dependency('nonexistant-dependency')
+dependency('nonexistent-dependency')
diff --git a/test cases/rust/19 structured sources/meson.build b/test cases/rust/19 structured sources/meson.build
index d84e83f15..d5b3909ea 100644
--- a/test cases/rust/19 structured sources/meson.build
+++ b/test cases/rust/19 structured sources/meson.build
@@ -27,7 +27,7 @@ target = executable(
),
)
-# Should not be coppied
+# Should not be copied
executable(
'no_copy_target',
structured_sources(
diff --git a/test cases/rust/9 unit tests/test2.rs b/test cases/rust/9 unit tests/test2.rs
index 9623c7c24..e06860510 100644
--- a/test cases/rust/9 unit tests/test2.rs
+++ b/test cases/rust/9 unit tests/test2.rs
@@ -3,8 +3,8 @@ use std::env;
fn main() {
let args: Vec<String> = env::args().collect();
- let first = args[1].parse::<i32>().expect("Invliad value for first argument.");
- let second = args[2].parse::<i32>().expect("Invliad value for second argument.");
+ let first = args[1].parse::<i32>().expect("Invalid value for first argument.");
+ let second = args[2].parse::<i32>().expect("Invalid value for second argument.");
let new = test::add(first, second);
println!("New value: {}", new);
diff --git a/test cases/unit/63 cmake parser/meson.build b/test cases/unit/63 cmake parser/meson.build
index 472561d69..d2a80c9e7 100644
--- a/test cases/unit/63 cmake parser/meson.build
+++ b/test cases/unit/63 cmake parser/meson.build
@@ -9,11 +9,11 @@ assert(dep.get_variable(cmake : 'VAR_WITH_SPACES') == 'With Spaces', 'set() with
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_THAT_IS_UNSET', default_value : 'sentinal') == 'sentinal', 'set() to unset is incorrect')
+assert(dep.get_variable(cmake : 'VAR_THAT_IS_UNSET', default_value : 'sentinel') == 'sentinel', '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_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 support this, so it should be unset.
-assert(dep.get_variable(cmake : 'ENV{var}', default_value : 'sentinal') == 'sentinal', 'set(ENV) should be ignored')
+assert(dep.get_variable(cmake : 'ENV{var}', default_value : 'sentinel') == 'sentinel', 'set(ENV) should be ignored')
diff --git a/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c b/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c
index 67261cb1d..fb9a9c2fb 100644
--- a/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c
+++ b/test cases/unit/77 nostdlib/subprojects/mylibc/libc.c
@@ -1,5 +1,5 @@
/* Do not use this as the basis of your own libc.
- * The code is probably unoptimal or wonky, as I
+ * The code is probably suboptimal or wonky, as I
* had no prior experience with this, but instead
* just fiddled with the code until it worked.
*/
diff --git a/test cases/unit/87 run native test/meson.build b/test cases/unit/87 run native test/meson.build
index 3bf419c14..e706dd790 100644
--- a/test cases/unit/87 run native test/meson.build
+++ b/test cases/unit/87 run native test/meson.build
@@ -1,6 +1,6 @@
project('run native test', ['c'])
-executable('terget_exe', 'main.c')
+executable('target_exe', 'main.c')
native_exe = executable('native_exe', 'main.c', native: true)
test('native_exe', native_exe, args: ['native_test_has_run.stamp'])
diff --git a/test cases/unit/98 link full name/proguser/receiver.c b/test cases/unit/98 link full name/proguser/receiver.c
index 65e9d8ea1..d661ae4ca 100644
--- a/test cases/unit/98 link full name/proguser/receiver.c
+++ b/test cases/unit/98 link full name/proguser/receiver.c
@@ -6,7 +6,7 @@ int __attribute__((weak)) get_checked(void) {
#define CHECK_VALUE (100)
#define TEST_SUCCESS (0)
-#define TEST_FAILTURE (-1)
+#define TEST_FAILURE (-1)
int main(void) {
if (get_checked() == CHECK_VALUE) {
@@ -14,5 +14,5 @@ int main(void) {
return TEST_SUCCESS;
}
fprintf(stdout,"bad\n");
- return TEST_FAILTURE;
+ return TEST_FAILURE;
}