diff options
| author | Josh Soref <2119212+jsoref@users.noreply.github.com> | 2023-04-11 16:04:17 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-04-11 19:21:05 -0400 |
| commit | cf9fd56bc905a2022ad48c93d25b5a73b57c8802 (patch) | |
| tree | a6858f0e790f801f49d8d4f161e9183deaf90e20 /test cases/common | |
| parent | e238b81ba0b89faa19b512d1e78de00dad1488ce (diff) | |
| download | meson-cf9fd56bc905a2022ad48c93d25b5a73b57c8802.tar.gz | |
fix various spelling issues
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Diffstat (limited to 'test cases/common')
24 files changed, 22 insertions, 22 deletions
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') |
