From 6d0b7d7e663cd28a02bd6c499193ae827766e78c Mon Sep 17 00:00:00 2001 From: Heejin Ahn Date: Wed, 31 Dec 2025 10:26:30 +0000 Subject: [PATCH] Fix typos in error/log messages This fixes typos in error / log messages. Split out of #26014. --- embuilder.py | 2 +- emconfigure.py | 2 +- emrun.py | 2 +- emsize.py | 2 +- src/audio_worklet.js | 2 +- src/lib/libautodebug.js | 2 +- src/lib/libccall.js | 2 +- src/lib/libembind.js | 2 +- src/runtime_asan.js | 2 +- src/runtime_init_memory.js | 2 +- src/runtime_safe_heap.js | 2 +- system/lib/libc/sbrk.c | 2 +- system/lib/libcxxabi/src/cxa_exception.h | 2 +- test/browser/test_sdl_set_clip_rect.c | 4 ++-- test/browser/test_sdl_togglefullscreen.c | 2 +- test/browser/webgl_with_closure.c | 2 +- test/core/pthread/test_pthread_dlopen.c | 2 +- test/core/test_em_asm_2.cpp | 2 +- test/core/test_em_asm_2.out | 2 +- test/core/test_externref.c | 4 ++-- test/core/test_externref.out | 4 ++-- test/core/test_wrap_malloc.c | 2 +- test/freetype/main_2.c | 2 +- test/fs/test_fs_bad_lookup.c | 6 +++--- test/openal/test_openal_capture.c | 2 +- test/other/test_mmap_and_munmap.c | 4 ++-- test/other/test_mmap_and_munmap_anonymous.cpp | 2 +- test/other/test_pthread_set_main_loop.c | 2 +- test/other/test_pthread_set_main_loop.out | 2 +- test/pthread/test_pthread_cancel_cond_wait.c | 2 +- test/pthread/test_pthread_tls_dylink.c | 2 +- test/runner.py | 4 ++-- test/sockets/test_enet_client.c | 2 +- test/sockets/test_enet_server.c | 2 +- test/sockets/test_sockets_partial_client.c | 4 ++-- test/test_browser.py | 2 +- test/test_core.py | 20 +++++++++---------- test/test_emscripten_async_wget2_data.cpp | 2 +- test/test_stress.py | 2 +- .../shared_memory_preprocessor_flags.c | 2 +- test/webaudio/audioworklet_emscripten_locks.c | 2 +- tools/link.py | 2 +- tools/wasm-sourcemap.py | 2 +- .../src/websocket_to_posix_proxy.c | 6 +++--- 44 files changed, 63 insertions(+), 63 deletions(-) diff --git a/embuilder.py b/embuilder.py index 005fd5b6f2418..217f2c3b7fa63 100755 --- a/embuilder.py +++ b/embuilder.py @@ -204,7 +204,7 @@ def main(): parser.add_argument('--lto', action='store_const', const='full', help='build bitcode object for LTO') parser.add_argument('--lto=thin', dest='lto', action='store_const', const='thin', help='build bitcode object for ThinLTO') parser.add_argument('--pic', action='store_true', - help='build relocatable objects for suitable for dynamic linking') + help='build relocatable objects suitable for dynamic linking') parser.add_argument('-f', '--force', action='store_true', help='force rebuild of target (by removing it first)') parser.add_argument('-v', '--verbose', action='store_true', diff --git a/emconfigure.py b/emconfigure.py index a9e9706ba1bf5..aecdd3baa50cd 100755 --- a/emconfigure.py +++ b/emconfigure.py @@ -40,7 +40,7 @@ def run(): args = sys.argv[1:] if 'cmake' in args: - print('error: use `emcmake` rather then `emconfigure` for cmake projects', file=sys.stderr) + print('error: use `emcmake` rather than `emconfigure` for cmake projects', file=sys.stderr) return 1 env = building.get_building_env() diff --git a/emrun.py b/emrun.py index bcc46ae881124..b4e4dbc0ee8c8 100644 --- a/emrun.py +++ b/emrun.py @@ -1558,7 +1558,7 @@ def parse_args(args): parser.add_argument('--json', action='store_true', help='If specified, --system-info and --browser-info are ' - 'outputted in JSON format.') + 'output in JSON format.') parser.add_argument('--safe-firefox-profile', action='store_true', help='If true, the browser is launched into a new clean ' diff --git a/emsize.py b/emsize.py index ce46649f6f3aa..935c237c9d224 100755 --- a/emsize.py +++ b/emsize.py @@ -46,7 +46,7 @@ def parse_args(argv): def print_sizes(js_file): if not os.path.isfile(js_file): - return error('Input JS file %s not foune' % js_file) + return error('Input JS file %s not found' % js_file) if not js_file.endswith('.js'): return error('Input file %s does not have a JS extension' % js_file) diff --git a/src/audio_worklet.js b/src/audio_worklet.js index 26dfa5d3ad823..e1e8985454e41 100644 --- a/src/audio_worklet.js +++ b/src/audio_worklet.js @@ -210,7 +210,7 @@ function createWasmAudioWorkletProcessor() { #if ASSERTIONS // If all the maths worked out, we arrived at the original stack address - console.assert(dataPtr == oldStackPtr, `AudioWorklet stack missmatch (audio data finishes at ${dataPtr} instead of ${oldStackPtr})`); + console.assert(dataPtr == oldStackPtr, `AudioWorklet stack mismatch (audio data finishes at ${dataPtr} instead of ${oldStackPtr})`); // Sanity checks. If these trip the most likely cause, beyond unforeseen // stack shenanigans, is that the 'render quantum size' changed after diff --git a/src/lib/libautodebug.js b/src/lib/libautodebug.js index dafdb6a9056c5..461201c02d184 100644 --- a/src/lib/libautodebug.js +++ b/src/lib/libautodebug.js @@ -64,7 +64,7 @@ addToLibrary({ return value; }, $set_funcref: (loc, index, value) => { - dbg('set_afuncef ' + [loc, index, value]); + dbg('set_funcref ' + [loc, index, value]); return value; }, $set_externref: (loc, index, value) => { diff --git a/src/lib/libccall.js b/src/lib/libccall.js index 6bd6ce8a85e4c..9803fbe26808f 100644 --- a/src/lib/libccall.js +++ b/src/lib/libccall.js @@ -105,7 +105,7 @@ addToLibrary({ // either. The only valid combination is to have no change in the async // data (so we either had one in flight and left it alone, or we didn't have // one), or to have nothing in flight and to start one. - assert(!(previousAsync && Asyncify.currData), 'We cannot start an async operation when one is already flight'); + assert(!(previousAsync && Asyncify.currData), 'We cannot start an async operation when one is already in flight'); assert(!(previousAsync && !Asyncify.currData), 'We cannot stop an async operation in flight'); #endif // This is a new async operation. The wasm is paused and has unwound its stack. diff --git a/src/lib/libembind.js b/src/lib/libembind.js index 7ed186cacd587..1aad93509adca 100644 --- a/src/lib/libembind.js +++ b/src/lib/libembind.js @@ -1119,7 +1119,7 @@ var LibraryEmbind = { break; default: - throwBindingError('Unsupporting sharing policy'); + throwBindingError('Unsupported sharing policy'); } } return ptr; diff --git a/src/runtime_asan.js b/src/runtime_asan.js index 952db227e8d3a..b76ca789f5bb4 100644 --- a/src/runtime_asan.js +++ b/src/runtime_asan.js @@ -5,7 +5,7 @@ */ #if !USE_ASAN -#error "should only be inclded in USE_ASAN mode" +#error "should only be included in USE_ASAN mode" #endif // C versions of asan_js_{load|store} will be used from compiled code, which have diff --git a/src/runtime_init_memory.js b/src/runtime_init_memory.js index 561dfb3adfc26..b7e7b4d233f62 100644 --- a/src/runtime_init_memory.js +++ b/src/runtime_init_memory.js @@ -6,7 +6,7 @@ // Create the wasm memory. (Note: this only applies if IMPORTED_MEMORY is defined) #if !IMPORTED_MEMORY -#error "this file should not be be included when IMPORTED_MEMORY is set" +#error "this file should not be included when IMPORTED_MEMORY is set" #endif // check for full engine support (use string 'subarray' to avoid closure compiler confusion) diff --git a/src/runtime_safe_heap.js b/src/runtime_safe_heap.js index 53e2469ed17e3..f497fd506a17e 100644 --- a/src/runtime_safe_heap.js +++ b/src/runtime_safe_heap.js @@ -5,7 +5,7 @@ */ #if !SAFE_HEAP -#error "should only be inclded in SAFE_HEAP mode" +#error "should only be included in SAFE_HEAP mode" #endif #if SAFE_HEAP_LOG diff --git a/system/lib/libc/sbrk.c b/system/lib/libc/sbrk.c index c370f9ec2f3d6..5f7695a4c6f1c 100644 --- a/system/lib/libc/sbrk.c +++ b/system/lib/libc/sbrk.c @@ -121,7 +121,7 @@ void *sbrk(intptr_t increment_) { int brk(void* ptr) { #ifdef __EMSCRIPTEN_SHARED_MEMORY__ // FIXME - printf("brk() is not theadsafe yet, https://github.com/emscripten-core/emscripten/issues/10006"); + printf("brk() is not threadsafe yet, https://github.com/emscripten-core/emscripten/issues/10006"); abort(); #else uintptr_t last = (uintptr_t)sbrk(0); diff --git a/system/lib/libcxxabi/src/cxa_exception.h b/system/lib/libcxxabi/src/cxa_exception.h index 527fc57086bac..37af57bf368db 100644 --- a/system/lib/libcxxabi/src/cxa_exception.h +++ b/system/lib/libcxxabi/src/cxa_exception.h @@ -35,7 +35,7 @@ struct _LIBCXXABI_HIDDEN __cxa_exception { void *padding; }; -static_assert(sizeof(__cxa_exception) % alignof(max_align_t) == 0, "__cxa_exception must have a size that is multipl of max alignment"); +static_assert(sizeof(__cxa_exception) % alignof(max_align_t) == 0, "__cxa_exception must have a size that is multiple of max alignment"); #else diff --git a/test/browser/test_sdl_set_clip_rect.c b/test/browser/test_sdl_set_clip_rect.c index 59eae7535b3da..36bd2c5fd8ae3 100644 --- a/test/browser/test_sdl_set_clip_rect.c +++ b/test/browser/test_sdl_set_clip_rect.c @@ -90,8 +90,8 @@ int main() { SDL_UpdateRect(dst, 0, 0, width, height); printf("There should be yellow background\n"); - printf("One the left side there should be red rect with green rect inside\n"); - printf("One the right side there should be blue rect with pink rect inside\n"); + printf("On the left side there should be red rect with green rect inside\n"); + printf("On the right side there should be blue rect with pink rect inside\n"); SDL_Quit(); diff --git a/test/browser/test_sdl_togglefullscreen.c b/test/browser/test_sdl_togglefullscreen.c index 935fabe64ed78..34fb6b80e2b0a 100644 --- a/test/browser/test_sdl_togglefullscreen.c +++ b/test/browser/test_sdl_togglefullscreen.c @@ -121,7 +121,7 @@ int main() { * Click and mouseup don't work. */ if (emscripten_set_mouseup_callback("#canvas", NULL, 1, mouseup) != EMSCRIPTEN_RESULT_SUCCESS) { - printf("Couldn't to set mouse callback. Test failed.\n"); + printf("Couldn't set mouse callback. Test failed.\n"); return 1; } diff --git a/test/browser/webgl_with_closure.c b/test/browser/webgl_with_closure.c index 2d9e79ae9b060..09a501ff32b86 100644 --- a/test/browser/webgl_with_closure.c +++ b/test/browser/webgl_with_closure.c @@ -47,7 +47,7 @@ break; case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE: printf("**** The value of GL_RENDERBUFFER_SAMPLES is not the same for all attached renderbuffers; " - "if the value of GL_TEXTURE_SAMPLES is the not same for all attached textures; or, if " + "if the value of GL_TEXTURE_SAMPLES is not the same for all attached textures; or, if " "the attached images are a mix of renderbuffers and textures, the value of " "GL_RENDERBUFFER_SAMPLES does not match the value of GL_TEXTURE_SAMPLES." "Or the value of GL_TEXTURE_FIXED_SAMPLE_LOCATIONS is not the same for all attached " diff --git a/test/core/pthread/test_pthread_dlopen.c b/test/core/pthread/test_pthread_dlopen.c index 78ca23454c8c4..564ac717042ba 100644 --- a/test/core/pthread/test_pthread_dlopen.c +++ b/test/core/pthread/test_pthread_dlopen.c @@ -24,7 +24,7 @@ static void* thread_main(void* arg) { started = true; while (!ready) { - printf("yeilding ..\n"); + printf("yielding ..\n"); sched_yield(); usleep(1000*100); } diff --git a/test/core/test_em_asm_2.cpp b/test/core/test_em_asm_2.cpp index 7e4dcf261dfb7..73e9b59315eaa 100644 --- a/test/core/test_em_asm_2.cpp +++ b/test/core/test_em_asm_2.cpp @@ -29,7 +29,7 @@ int main() { EM_ASM("out('3. this is \"double\" \"quotes\"')"); EM_ASM({"out('4. this is \"double\" \"quotes\"')"}); EM_ASM({out('5. this is \"double\" \"quotes\"')}); - EM_ASM({out('6. this is "double" "quotes" without esacping')}); + EM_ASM({out('6. this is "double" "quotes" without escaping')}); EM_ASM("{out('7. this is \"double\" \"quotes\"')}"); printf("\nEM_ASM: Pass a string\n"); diff --git a/test/core/test_em_asm_2.out b/test/core/test_em_asm_2.out index 3e9fe05e39e40..5809d180aa06f 100644 --- a/test/core/test_em_asm_2.out +++ b/test/core/test_em_asm_2.out @@ -18,7 +18,7 @@ EM_ASM: Double quotes inside a string 3. this is "double" "quotes" 4. this is "double" "quotes" 5. this is "double" "quotes" -6. this is "double" "quotes" without esacping +6. this is "double" "quotes" without escaping 7. this is "double" "quotes" EM_ASM: Pass a string diff --git a/test/core/test_externref.c b/test/core/test_externref.c index d087b88b8d0e2..17a63698f5c78 100644 --- a/test/core/test_externref.c +++ b/test/core/test_externref.c @@ -7,9 +7,9 @@ int main() { printf("in main\n"); log_externref(); get_externref(); - printf("extenref stored\n"); + printf("externref stored\n"); log_externref(); - printf("extenref logged\n"); + printf("externref logged\n"); return 0; } diff --git a/test/core/test_externref.out b/test/core/test_externref.out index 4bd491b8adf16..8adb2e2395540 100644 --- a/test/core/test_externref.out +++ b/test/core/test_externref.out @@ -1,5 +1,5 @@ in main log_externref_js: null -extenref stored +externref stored log_externref_js: {"foo":1} -extenref logged +externref logged diff --git a/test/core/test_wrap_malloc.c b/test/core/test_wrap_malloc.c index be58ffa2ae917..bf80e598ceadf 100644 --- a/test/core/test_wrap_malloc.c +++ b/test/core/test_wrap_malloc.c @@ -43,7 +43,7 @@ int main() { void *ptr = malloc(1024 * 1024); // Make sure we do something with the pointer do ensure the optimizer // doesn't completely remove the allocation. - emscripten_console_logf("alloacted: %p", ptr); + emscripten_console_logf("allocated: %p", ptr); free(ptr); } diff --git a/test/freetype/main_2.c b/test/freetype/main_2.c index 567d63501f465..dbe1fca959fc6 100644 --- a/test/freetype/main_2.c +++ b/test/freetype/main_2.c @@ -116,7 +116,7 @@ main( int argc, /* use 50pt at 100dpi */ error = FT_Set_Char_Size( face, 0, 32 * 64, 0, 0 ); /* set character size */ - if (error) printf("Set_Cshar_Size Error! %d\n", error); + if (error) printf("Set_Char_Size Error! %d\n", error); slot = face->glyph; diff --git a/test/fs/test_fs_bad_lookup.c b/test/fs/test_fs_bad_lookup.c index 690798bfc138a..00f04b03ab9fc 100644 --- a/test/fs/test_fs_bad_lookup.c +++ b/test/fs/test_fs_bad_lookup.c @@ -51,7 +51,7 @@ int main() { return 1; } if (exists("file1/dir")) { - printf("Path should not exists: file1/dir\n"); + printf("Path should not exist: file1/dir\n"); return 1; } @@ -61,7 +61,7 @@ int main() { return 1; } if (exists("file2/dir")) { - printf("Path should not exists: file2/dir\n"); + printf("Path should not exist: file2/dir\n"); return 1; } @@ -71,7 +71,7 @@ int main() { return 1; } if (exists("file3/dir")) { - printf("Path should not exists: file3/dir\n"); + printf("Path should not exist: file3/dir\n"); return 1; } diff --git a/test/openal/test_openal_capture.c b/test/openal/test_openal_capture.c index 38c467f1ef2f9..5982b44cb8004 100644 --- a/test/openal/test_openal_capture.c +++ b/test/openal/test_openal_capture.c @@ -164,7 +164,7 @@ void iter() { if (app.captured < target) return; else if (app.captured > target) { - fprintf(stderr, "Captured frames exeedes expectations!\n"); + fprintf(stderr, "Captured frames exceeds expectations!\n"); end_test(EXIT_FAILURE); } diff --git a/test/other/test_mmap_and_munmap.c b/test/other/test_mmap_and_munmap.c index 2ecba69a5a728..755c3878a9478 100644 --- a/test/other/test_mmap_and_munmap.c +++ b/test/other/test_mmap_and_munmap.c @@ -147,7 +147,7 @@ int test_mmap_anon() { void *m = (char *)mmap(NULL, file_len(), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); ASSERT(m != MAP_FAILED, "Failed to mmap pages"); - ASSERT(munmap(m, file_len()) == 0, "Failed to unmmap allocated pages"); + ASSERT(munmap(m, file_len()) == 0, "Failed to unmap allocated pages"); TEST_PASS(); } @@ -170,7 +170,7 @@ int test_mmap_fixed() { char *m3 = (char *)mmap(m, file_len(), PROT_READ, MAP_FIXED, fileno(f_ro), invalid_offset); ASSERT(m3 == MAP_FAILED && errno == EINVAL, "Expected EINVAL for invalid offset"); - ASSERT(munmap(m, file_len()) == 0, "Failed to unmmap allocated pages"); + ASSERT(munmap(m, file_len()) == 0, "Failed to unmap allocated pages"); TEST_PASS(); } diff --git a/test/other/test_mmap_and_munmap_anonymous.cpp b/test/other/test_mmap_and_munmap_anonymous.cpp index 722a116a4b06f..5d9fa02ca500d 100644 --- a/test/other/test_mmap_and_munmap_anonymous.cpp +++ b/test/other/test_mmap_and_munmap_anonymous.cpp @@ -61,7 +61,7 @@ int test_mmap_anon() { void *m = (char *)mmap(NULL, file_len(), PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); ASSERT(m != MAP_FAILED, "Failed to mmap pages"); - ASSERT(munmap(m, file_len()) == 0, "Failed to unmmap allocated pages"); + ASSERT(munmap(m, file_len()) == 0, "Failed to unmap allocated pages"); TEST_PASS(); } diff --git a/test/other/test_pthread_set_main_loop.c b/test/other/test_pthread_set_main_loop.c index c19c20c84756e..576367e948c8c 100644 --- a/test/other/test_pthread_set_main_loop.c +++ b/test/other/test_pthread_set_main_loop.c @@ -27,7 +27,7 @@ void* loopthread(void* arg) { void mainloop() { if (loopthread_done) { - printf("joinng..\n"); + printf("joining..\n"); pthread_join(thread, NULL); printf("join done\n"); emscripten_cancel_main_loop(); diff --git a/test/other/test_pthread_set_main_loop.out b/test/other/test_pthread_set_main_loop.out index 604dfb09ef171..dead1f0adaf7c 100644 --- a/test/other/test_pthread_set_main_loop.out +++ b/test/other/test_pthread_set_main_loop.out @@ -11,5 +11,5 @@ loop thread: 9 loop thread: 10 loop thread: 11 loop thread done -joinng.. +joining.. join done diff --git a/test/pthread/test_pthread_cancel_cond_wait.c b/test/pthread/test_pthread_cancel_cond_wait.c index 19628ec45d765..c72d5c3019180 100644 --- a/test/pthread/test_pthread_cancel_cond_wait.c +++ b/test/pthread/test_pthread_cancel_cond_wait.c @@ -72,7 +72,7 @@ int main() { th_cancelled = true; pthread_mutex_unlock(&mutex); - emscripten_outf("Main thread waitnig for side-thread"); + emscripten_outf("Main thread waiting for side-thread"); pthread_barrier_wait(&barrier); pthread_barrier_destroy(&barrier); diff --git a/test/pthread/test_pthread_tls_dylink.c b/test/pthread/test_pthread_tls_dylink.c index a7734c66138de..e8ffb7a0a4392 100644 --- a/test/pthread/test_pthread_tls_dylink.c +++ b/test/pthread/test_pthread_tls_dylink.c @@ -14,7 +14,7 @@ void run_test() { printf("&tls_foo_addr: %p\n", &tls_foo_addr); // The values stored foo_addr and tls_foo_addr should both be // the address of foo - printf("foo_add=%p tls_foo_addr=%p [delta=%ld]\n", foo_addr, tls_foo_addr, foo_addr - tls_foo_addr); + printf("foo_addr=%p tls_foo_addr=%p [delta=%ld]\n", foo_addr, tls_foo_addr, foo_addr - tls_foo_addr); assert(foo_addr == &foo); assert(tls_foo_addr == &foo); } diff --git a/test/runner.py b/test/runner.py index 9b1703594a844..e82b335eaa7ab 100755 --- a/test/runner.py +++ b/test/runner.py @@ -119,7 +119,7 @@ def check_js_engines(): if not all(jsrun.check_engine(e) for e in config.JS_ENGINES): - errlog('Not all the JS engines in JS_ENGINES appears to work.') + errlog('Not all the JS engines in JS_ENGINES appear to work.') sys.exit(1) if common.EMTEST_ALL_ENGINES: @@ -441,7 +441,7 @@ def run_tests(options, suites): testRunner = SingleLineTestRunner(failfast=options.failfast) else: if not options.ansi: - print('using verbose test runner (ANSI not avilable)') + print('using verbose test runner (ANSI not available)') else: print('using verbose test runner (verbose output requested)') testRunner = ColorTextRunner(failfast=options.failfast) diff --git a/test/sockets/test_enet_client.c b/test/sockets/test_enet_client.c index 46d03067ce22d..01ea93bb48c39 100644 --- a/test/sockets/test_enet_client.c +++ b/test/sockets/test_enet_client.c @@ -48,7 +48,7 @@ void main_loop() { enet_packet_destroy (event.packet); break; case ENET_EVENT_TYPE_DISCONNECT: - printf ("%s disconected.\n", (char*)event.peer -> data); + printf ("%s disconnected.\n", (char*)event.peer -> data); /* Reset the peer's client information. */ event.peer -> data = NULL; enet_host_destroy(host); diff --git a/test/sockets/test_enet_server.c b/test/sockets/test_enet_server.c index b15b727d5ffb4..ac68821b987dd 100644 --- a/test/sockets/test_enet_server.c +++ b/test/sockets/test_enet_server.c @@ -73,7 +73,7 @@ printf("enet host, got event of type %d\n", event.type); enet_packet_destroy (event.packet); break; case ENET_EVENT_TYPE_DISCONNECT: - printf ("%s disconected.\n", (char*)event.peer -> data); + printf ("%s disconnected.\n", (char*)event.peer -> data); /* Reset the peer's client information. */ event.peer -> data = NULL; enet_host_destroy(host); diff --git a/test/sockets/test_sockets_partial_client.c b/test/sockets/test_sockets_partial_client.c index 4b3c675722b36..3f9cec07e7ac0 100644 --- a/test/sockets/test_sockets_partial_client.c +++ b/test/sockets/test_sockets_partial_client.c @@ -57,7 +57,7 @@ void iter() { return; //try again } - perror("unexcepted end of data"); + perror("unexpected end of data"); finish(EXIT_FAILURE); } @@ -72,7 +72,7 @@ void iter() { printf("got %d,%d\n", res, packetLength); if (res != packetLength) { - fprintf(stderr, "lost packet data, expected: %d readed: %d", packetLength, res); + fprintf(stderr, "lost packet data, expected: %d read: %d", packetLength, res); finish(EXIT_FAILURE); } diff --git a/test/test_browser.py b/test/test_browser.py index 89247368832c5..b196345c9fb75 100644 --- a/test/test_browser.py +++ b/test/test_browser.py @@ -5269,7 +5269,7 @@ def test_emmalloc_3gb(self, args): # Test that it is possible to malloc() a huge 3GB memory block in 4GB mode using dlmalloc. @no_firefox('no 4GB support yet') - @no_2gb('not enough space tp run in this mode') + @no_2gb('not enough space to run in this mode') def test_dlmalloc_3gb(self): if self.is_4gb(): self.set_setting('MAXIMUM_MEMORY', '8GB') diff --git a/test/test_core.py b/test/test_core.py index 29e5fc1d54dc0..4fed9b72b8087 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -151,7 +151,7 @@ def asan(func): @no_safe_heap('asan does not work with SAFE_HEAP') @no_wasm2js('TODO: ASAN in wasm2js') @no_wasm64('TODO: ASAN in memory64') - @no_2gb('asan doesnt support GLOBAL_BASE') + @no_2gb("asan doesn't support GLOBAL_BASE") @no_esm_integration('sanitizers do not support WASM_ESM_INTEGRATION') def decorated(self, *args, **kwargs): return func(self, *args, **kwargs) @@ -2210,9 +2210,9 @@ def test_memorygrowth_linear_step(self): self.cflags += ['-sALLOW_MEMORY_GROWTH', '-sSTACK_SIZE=1Mb', '-sINITIAL_MEMORY=32Mb', '-sMAXIMUM_MEMORY=64Mb', '-sMEMORY_GROWTH_LINEAR_STEP=1Mb'] self.do_core_test('test_memorygrowth_linear_step.c') - @no_ubsan('UBSan seems to effect the precise memory usage') - @no_4gb('depends on specifc memory layout') - @no_2gb('depends on specifc memory layout') + @no_ubsan('UBSan seems to affect the precise memory usage') + @no_4gb('depends on specific memory layout') + @no_2gb('depends on specific memory layout') def test_memorygrowth_geometric_step(self): if self.has_changed_setting('ALLOW_MEMORY_GROWTH'): self.skipTest('test needs to modify memory growth') @@ -2738,7 +2738,7 @@ def test_pthread_tls(self): self.skipTest('MINIMAL_RUNTIME + threads + asan does not work') self.do_runf('pthread/test_pthread_tls.c') - @no_modularize_instance('uses global Module objecgt') + @no_modularize_instance('uses global Module object') def test_pthread_run_script(self): if not self.is_optimizing() and ('-flto' in self.cflags or '-flto=thin' in self.cflags): self.skipTest('https://github.com/emscripten-core/emscripten/issues/25015') @@ -4145,7 +4145,7 @@ def test_dylink_function_pointer_equality(self): int main() { void* puts_side = get_address(); printf("main module address %p.\n", &puts); - printf("side module address address %p.\n", puts_side); + printf("side module address %p.\n", puts_side); if (&puts == puts_side) printf("success\n"); else @@ -4626,8 +4626,8 @@ def test_dylink_jslib(self): extern int main2(); double sidey() { int temp = main2(); - printf("main2 sed: %d\n", temp); - printf("main2 sed: %u, %c\n", temp, temp/2); + printf("main2 said: %d\n", temp); + printf("main2 said: %u, %c\n", temp, temp/2); return test_lib_func(temp); } ''', expected='other says 45.2', main_cflags=['--js-library', 'lib.js'], force_c=True) @@ -5750,7 +5750,7 @@ def test_utf32(self): @no_sanitize('requires libc to be built with -fshort-char') def test_utf32_short_wchar(self): if '-flto' in self.cflags or '-flto=thin' in self.cflags: - self.skipTest('-fshort-wchar is not compatible with LTO (libraries would need rebuilting)') + self.skipTest('-fshort-wchar is not compatible with LTO (libraries would need rebuilding)') self.do_runf('utf32.cpp', 'OK (short).\n', cflags=['-fshort-wchar']) @with_both_text_decoder @@ -6021,7 +6021,7 @@ def test_fs_rename_on_existing(self): self.do_runf('fs/test_fs_rename_on_existing.c', 'success') @also_with_nodefs_both - @no_windows('stat ino values dont match on windows') + @no_windows("stat ino values don't match on windows") @crossplatform @no_wasmfs('Assertion failed: "a_ino == sta.st" in test_fs_readdir_ino_matches_stat_ino.c, line 58. https://github.com/emscripten-core/emscripten/issues/25035') def test_fs_readdir_ino_matches_stat_ino(self): diff --git a/test/test_emscripten_async_wget2_data.cpp b/test/test_emscripten_async_wget2_data.cpp index eb92ca6dd5abc..d6881f926c523 100644 --- a/test/test_emscripten_async_wget2_data.cpp +++ b/test/test_emscripten_async_wget2_data.cpp @@ -49,7 +49,7 @@ void onerror(unsigned handle, void* arg, int status, const char* status_text) { error_count++; request->status = FAIL; } else if (status_text != nullptr && request->expected_http_status_text == nullptr) { - printf("Error: Request [%s] gave status text [%s] but no response was expted\n", + printf("Error: Request [%s] gave status text [%s] but no response was expected\n", request->target, status_text); error_count++; request->status = FAIL; diff --git a/test/test_stress.py b/test/test_stress.py index ae4731efbf413..82ca9c421bcdc 100644 --- a/test/test_stress.py +++ b/test/test_stress.py @@ -76,7 +76,7 @@ def test_run(): @node_pthreads @is_slow_test def test_stress_proxy_to_pthread_hello_world(self): - self.skipTest('Occassionally hangs. https://github.com/emscripten-core/emscripten/issues/20067') + self.skipTest('Occasionally hangs. https://github.com/emscripten-core/emscripten/issues/20067') self.set_setting('ABORT_ON_WASM_EXCEPTIONS') self.set_setting('PROXY_TO_PTHREAD') self.set_setting('EXIT_RUNTIME') diff --git a/test/wasm_worker/shared_memory_preprocessor_flags.c b/test/wasm_worker/shared_memory_preprocessor_flags.c index 5a268f484de1d..b884b0faf6404 100644 --- a/test/wasm_worker/shared_memory_preprocessor_flags.c +++ b/test/wasm_worker/shared_memory_preprocessor_flags.c @@ -5,7 +5,7 @@ #endif #ifdef __EMSCRIPTEN_WASM_WORKERS__ -#error __EMSCRIPTEN_WASM_WORKERS__ should not defined when building with -sSHARED_MEMORY=1! +#error __EMSCRIPTEN_WASM_WORKERS__ should not be defined when building with -sSHARED_MEMORY=1! #endif #ifdef __EMSCRIPTEN_PTHREADS__ diff --git a/test/webaudio/audioworklet_emscripten_locks.c b/test/webaudio/audioworklet_emscripten_locks.c index 20471eced5f63..9939315531073 100644 --- a/test/webaudio/audioworklet_emscripten_locks.c +++ b/test/webaudio/audioworklet_emscripten_locks.c @@ -142,7 +142,7 @@ bool MainLoop(double time, void* data) { // Spin here until released in process (but don't change test until we know this case ran) whichTest = TEST_WAIT_INFINTE_2; emscripten_lock_busyspin_waitinf_acquire(&testLock); - emscripten_out("TEST_WAIT_INFINTE (from main)"); + emscripten_out("TEST_WAIT_INFINITE (from main)"); break; case TEST_DONE: // Finished, exit from the main thread diff --git a/tools/link.py b/tools/link.py index 67de2fbf49c08..e9b0687b45575 100644 --- a/tools/link.py +++ b/tools/link.py @@ -949,7 +949,7 @@ def phase_linker_setup(options, linker_args): # noqa: C901, PLR0912, PLR0915 settings.OUTPUT_FORMAT = options.oformat.name if settings.SUPPORT_BIG_ENDIAN and settings.WASM2JS: - exit_with_error('WASMJ2S is currently not compatible with SUPPORT_BIG_ENDIAN') + exit_with_error('WASM2JS is currently not compatible with SUPPORT_BIG_ENDIAN') if settings.WASM_ESM_INTEGRATION: default_setting('MODULARIZE', 'instance') diff --git a/tools/wasm-sourcemap.py b/tools/wasm-sourcemap.py index 487f0c1f48e64..2e52e136c5b63 100755 --- a/tools/wasm-sourcemap.py +++ b/tools/wasm-sourcemap.py @@ -41,7 +41,7 @@ def parse_args(args): parser.add_argument('-l', '--load-prefix', nargs='*', help='replace source debug filename prefix for reading sources from file system (see also --sources)', default=[]) parser.add_argument('-w', nargs='?', help='set output wasm file') parser.add_argument('-x', '--strip', action='store_true', help='removes debug and linking sections') - parser.add_argument('-u', '--source-map-url', nargs='?', help='specifies sourceMappingURL section contest') + parser.add_argument('-u', '--source-map-url', nargs='?', help='specifies sourceMappingURL section content') parser.add_argument('--dwarfdump', help="path to llvm-dwarfdump executable") parser.add_argument('--dwarfdump-output', nargs='?', help=argparse.SUPPRESS) parser.add_argument('--basepath', help='base path for source files, which will be relative to this') diff --git a/tools/websocket_to_posix_proxy/src/websocket_to_posix_proxy.c b/tools/websocket_to_posix_proxy/src/websocket_to_posix_proxy.c index 776bcdad9b66d..337aa062fa400 100644 --- a/tools/websocket_to_posix_proxy/src/websocket_to_posix_proxy.c +++ b/tools/websocket_to_posix_proxy/src/websocket_to_posix_proxy.c @@ -338,7 +338,7 @@ static int Translate_Socket_Domain(int domain) { // case MUSL_AF_KCM: return AF_KCM; case MUSL_AF_MAX: return AF_MAX; default: - fprintf(stderr, "Uncrecognized Socket Domain %d!\n", domain); + fprintf(stderr, "Unrecognized Socket Domain %d!\n", domain); return domain; } } @@ -372,7 +372,7 @@ static int Translate_Socket_Type(int type) { // case MUSL_SOCK_DCCP: return SOCK_DCCP; // case MUSL_SOCK_PACKET: return SOCK_PACKET; default: - fprintf(stderr, "Uncrecognized socket type %d!\n", type); + fprintf(stderr, "Unrecognized socket type %d!\n", type); return type; } } @@ -519,7 +519,7 @@ static int Translate_Socket_Level(int level) { // case MUSL_SOL_NFC: return SOL_NFC; // case MUSL_SOL_KCM: return SOL_KCM; default: - fprintf(stderr, "Uncrecognized socket level %d!\n", level); + fprintf(stderr, "Unrecognized socket level %d!\n", level); return level; } }