diff --git a/emrun.py b/emrun.py index 64edfac483146..ca9f9faf513b1 100644 --- a/emrun.py +++ b/emrun.py @@ -832,12 +832,12 @@ def find_gpu_model(model): VideoCardString = winreg.QueryValueEx(hVideoReg, '\\Device\\Video' + str(i))[0] # Get Rid of Registry/Machine from the string VideoCardStringSplit = VideoCardString.split('\\') - ClearnVideoCardString = "\\".join(VideoCardStringSplit[3:]) + CleanVideoCardString = "\\".join(VideoCardStringSplit[3:]) # Go up one level for detailed # VideoCardStringRoot = "\\".join(VideoCardStringSplit[3:len(VideoCardStringSplit)-1]) # Get the graphics card information - hVideoCardReg = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, ClearnVideoCardString) + hVideoCardReg = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, CleanVideoCardString) try: VideoCardDescription = winreg.QueryValueEx(hVideoCardReg, 'Device Description')[0] except WindowsError: diff --git a/src/lib/libglut.js b/src/lib/libglut.js index 5137d3c8ac13e..1590c7ee25095 100644 --- a/src/lib/libglut.js +++ b/src/lib/libglut.js @@ -185,14 +185,14 @@ var LibraryGLUT = { var key = GLUT.getSpecialKey(event['keyCode']); if (key !== null) { if (GLUT.specialUpFunc) { - event.preventDefault (); + event.preventDefault(); GLUT.saveModifiers(event); {{{ makeDynCall('viii', 'GLUT.specialUpFunc') }}}(key, Browser.mouseX, Browser.mouseY); } } else { key = GLUT.getASCIIKey(event); if (key !== null && GLUT.keyboardUpFunc) { - event.preventDefault (); + event.preventDefault(); GLUT.saveModifiers(event); {{{ makeDynCall('viii', 'GLUT.keyboardUpFunc') }}}(key, Browser.mouseX, Browser.mouseY); } diff --git a/src/lib/libhtml5.js b/src/lib/libhtml5.js index 142cd315afe43..d52250aab6cec 100644 --- a/src/lib/libhtml5.js +++ b/src/lib/libhtml5.js @@ -1044,7 +1044,7 @@ var LibraryHTML5 = { var eventSize = {{{ C_STRUCTS.EmscriptenFullscreenChangeEvent.__size__ }}}; JSEvents.fullscreenChangeEvent ||= _malloc(eventSize); - var fullscreenChangeEventhandlerFunc = (e) => { + var fullscreenChangeEventHandlerFunc = (e) => { var fullscreenChangeEvent = JSEvents.fullscreenChangeEvent; fillFullscreenChangeEventData(fullscreenChangeEvent); @@ -1061,7 +1061,7 @@ var LibraryHTML5 = { eventTypeId, userData, callbackfunc, - handlerFunc: fullscreenChangeEventhandlerFunc, + handlerFunc: fullscreenChangeEventHandlerFunc, useCapture }; return JSEvents.registerOrRemoveHandler(eventHandler); diff --git a/src/lib/libwasi.js b/src/lib/libwasi.js index 651fb52e3847c..d26aa31728e67 100644 --- a/src/lib/libwasi.js +++ b/src/lib/libwasi.js @@ -423,7 +423,7 @@ var WasiLibrary = { path_open__sig: 'iiiiiiiiii', path_open__deps: ['$wasiRightsToMuslOFlags', '$wasiOFlagsToMuslOFlags', '$preopens'], path_open: (fd, dirflags, path, path_len, oflags, - fs_rights_base, fs_rights_inherting, + fs_rights_base, fs_rights_inheriting, fdflags, opened_fd) => { if (!(fd in preopens)) { return {{{ cDefs.EBADF }}}; diff --git a/system/include/wasi/api.h b/system/include/wasi/api.h index 1f882aafa9b5d..17542122556b3 100644 --- a/system/include/wasi/api.h +++ b/system/include/wasi/api.h @@ -2408,7 +2408,7 @@ __wasi_errno_t __wasi_path_open( */ __wasi_rights_t fs_rights_base, - __wasi_rights_t fs_rights_inherting, + __wasi_rights_t fs_rights_inheriting, __wasi_fdflags_t fdflags, diff --git a/system/lib/html5/offscreencanvas.c b/system/lib/html5/offscreencanvas.c index 536f29e704437..e147a8a1db1b8 100644 --- a/system/lib/html5/offscreencanvas.c +++ b/system/lib/html5/offscreencanvas.c @@ -2,14 +2,14 @@ #include "emscripten_internal.h" -typedef struct set_cavas_size_t { +typedef struct set_canvas_size_t { const char* target; int width; int height; -} set_cavas_size_t; +} set_canvas_size_t; static void do_set_size(void* arg) { - set_cavas_size_t* args = (set_cavas_size_t*)arg; + set_canvas_size_t* args = (set_canvas_size_t*)arg; emscripten_set_canvas_element_size(args->target, args->width, args->height); free((char *) args->target); free(arg); @@ -20,7 +20,7 @@ void _emscripten_set_offscreencanvas_size_on_thread(pthread_t t, const char* target, int width, int height) { - set_cavas_size_t* arg = malloc(sizeof(set_cavas_size_t)); + set_canvas_size_t* arg = malloc(sizeof(set_canvas_size_t)); arg->target = target; // taking ownership: will be freed in do_set_size arg->width = width; arg->height = height; diff --git a/system/lib/libc/musl/arch/emscripten/syscall_arch.h b/system/lib/libc/musl/arch/emscripten/syscall_arch.h index ff2fb2c559fa2..33fc42a99be3b 100644 --- a/system/lib/libc/musl/arch/emscripten/syscall_arch.h +++ b/system/lib/libc/musl/arch/emscripten/syscall_arch.h @@ -90,7 +90,7 @@ int __syscall_symlinkat(intptr_t target, int newdirfd, intptr_t linkpath); int __syscall_readlinkat(int dirfd, intptr_t path, intptr_t buf, size_t bufsize); int __syscall_fchmodat2(int dirfd, intptr_t path, int mode, int flags); int __syscall_faccessat(int dirfd, intptr_t path, int amode, int flags); -int __syscall_pselect6(int nfds, intptr_t readfds, intptr_t writefds, intptr_t exceptfds, intptr_t timeout, intptr_t sigmaks); +int __syscall_pselect6(int nfds, intptr_t readfds, intptr_t writefds, intptr_t exceptfds, intptr_t timeout, intptr_t sigmask); int __syscall_utimensat(int dirfd, intptr_t path, intptr_t times, int flags); int __syscall_fallocate(int fd, int mode, off_t offset, off_t len); int __syscall_dup3(int fd, int suggestfd, int flags); @@ -102,7 +102,7 @@ int __syscall_socket(int domain, int type, int protocol, int dummy1, int dummy2, int __syscall_socketpair(int domain, int type, int protocol, intptr_t fds, int dummy, int dummy2); int __syscall_bind(int sockfd, intptr_t addr, size_t alen, int dummy, int dummy2, int dummy3); int __syscall_connect(int sockfd, intptr_t addr, size_t len, int dummy, int dummy2, int dummy3); -int __syscall_listen(int sockfd, int backlock, int dummy1, int dummy2, int dummy3, int dummy4); +int __syscall_listen(int sockfd, int backlog, int dummy1, int dummy2, int dummy3, int dummy4); int __syscall_accept4(int sockfd, intptr_t addr, intptr_t addrlen, int flags, int dummy1, int dummy2); int __syscall_getsockopt(int sockfd, int level, int optname, intptr_t optval, intptr_t optlen, int dummy); int __syscall_setsockopt(int sockfd, int level, int optname, intptr_t optval, size_t optlen, int dummy); diff --git a/system/lib/update_llvm_libc.py b/system/lib/update_llvm_libc.py index 1e2181281ab42..8508bb792b67b 100644 --- a/system/lib/update_llvm_libc.py +++ b/system/lib/update_llvm_libc.py @@ -92,12 +92,12 @@ def main(): upstream_dir = os.path.join(libc_upstream_dir, dirname) local_dir = os.path.join(libc_local_dir, dirname) copy_tree(upstream_dir, local_dir) - + # Certain llvm-libc files that are incompatible in Emscripten - for excludsion_pattern in libc_exclusion_patterns: - files_to_exclude = glob.glob(os.path.join(libc_local_dir, excludsion_pattern)) + for exclusion_pattern in libc_exclusion_patterns: + files_to_exclude = glob.glob(os.path.join(libc_local_dir, exclusion_pattern)) for file in files_to_exclude: - os.remove(file) + os.remove(file) if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/system/lib/wasmfs/syscalls.cpp b/system/lib/wasmfs/syscalls.cpp index 6e336f4c4fed2..9e5ea3ca6ef42 100644 --- a/system/lib/wasmfs/syscalls.cpp +++ b/system/lib/wasmfs/syscalls.cpp @@ -1716,7 +1716,7 @@ int __syscall_socket( } int __syscall_listen( - int sockfd, int backlock, int dummy1, int dummy2, int dummy3, int dummy4) { + int sockfd, int backlog, int dummy1, int dummy2, int dummy3, int dummy4) { return -ENOSYS; } diff --git a/system/lib/wasmfs/wasmfs.cpp b/system/lib/wasmfs/wasmfs.cpp index 7d0a714f5a0e6..7a771a8ff4bd0 100644 --- a/system/lib/wasmfs/wasmfs.cpp +++ b/system/lib/wasmfs/wasmfs.cpp @@ -16,7 +16,7 @@ namespace wasmfs { #ifdef WASMFS_CASE_INSENSITIVE -backend_t createIgnoreCaseBackend(std::function createBacken); +backend_t createIgnoreCaseBackend(std::function createBackend); #endif // The below lines are included to make the compiler believe that the global diff --git a/test/browser/test_glfw3.c b/test/browser/test_glfw3.c index 0f82a3fb27f88..95748fceccd3d 100644 --- a/test/browser/test_glfw3.c +++ b/test/browser/test_glfw3.c @@ -252,8 +252,8 @@ int main() { } { - assert(glfwExtensionSupported("nonexistant") == 0); - assert(glfwGetProcAddress("nonexistant") == NULL); + assert(glfwExtensionSupported("nonexistent") == 0); + assert(glfwGetProcAddress("nonexistent") == NULL); } #endif diff --git a/test/browser/test_sdl2_canvas_palette_2.c b/test/browser/test_sdl2_canvas_palette_2.c index 14ba158f0a768..0ce9d16e9a94c 100644 --- a/test/browser/test_sdl2_canvas_palette_2.c +++ b/test/browser/test_sdl2_canvas_palette_2.c @@ -15,7 +15,7 @@ static SDL_Surface *screen; static SDL_Color pal[COLOR_COUNT +1]; -void pallete(int red, int green, int blue) { +void palette(int red, int green, int blue) { // initialize sdl palette // with gradient colors pal[0].r = 0; @@ -65,15 +65,15 @@ int main(int argc, char** argv) { printf("%s\n", argv[1]); if (strcmp(argv[1], "-r") == 0) { printf("set [red]\n"); - pallete(255, 0, 0); + palette(255, 0, 0); } if (strcmp(argv[1], "-g") == 0) { printf("set [green]\n"); - pallete(0, 255, 0); + palette(0, 255, 0); } if (strcmp(argv[1], "-b") == 0) { printf("set [blue]\n"); - pallete(0, 0, 255); + palette(0, 0, 255); } } diff --git a/test/browser/test_sdl_canvas_palette_2.c b/test/browser/test_sdl_canvas_palette_2.c index d7df447c7bfc0..ba8f4cd40b5f4 100644 --- a/test/browser/test_sdl_canvas_palette_2.c +++ b/test/browser/test_sdl_canvas_palette_2.c @@ -15,7 +15,7 @@ static SDL_Surface *screen; static SDL_Color pal[COLOR_COUNT +1]; -void pallete(int red, int green, int blue) { +void palette(int red, int green, int blue) { // initialize sdl palette // with gradient colors pal[0].r = 0; @@ -59,15 +59,15 @@ int main(int argc, char** argv) { printf("%s\n", argv[1]); if (strcmp(argv[1], "-r") == 0) { printf("set [red]\n"); - pallete(255, 0, 0); + palette(255, 0, 0); } if (strcmp(argv[1], "-g") == 0) { printf("set [green]\n"); - pallete(0, 255, 0); + palette(0, 255, 0); } if (strcmp(argv[1], "-b") == 0) { printf("set [blue]\n"); - pallete(0, 0, 255); + palette(0, 0, 255); } } diff --git a/test/clang_native.py b/test/clang_native.py index e4dcc61025db8..a835166bb65f9 100644 --- a/test/clang_native.py +++ b/test/clang_native.py @@ -124,11 +124,11 @@ def highest_version_subdir(path): vc_root = os.path.join(visual_studio_path, 'VC') vc_code_root = highest_version_subdir(os.path.join(vc_root, 'Tools', 'MSVC')) if not vc_code_root: - raise Exception ('Unable to find Visual Studio INCLUDE root directory. Run in Visual Studio command prompt to avoid the need to autoguess this location.') + raise Exception('Unable to find Visual Studio INCLUDE root directory. Run in Visual Studio command prompt to avoid the need to autoguess this location.') windows_sdk_dir = highest_version_subdir(os.path.join(prog_files_x86, 'Windows Kits')) if not windows_sdk_dir: - raise Exception ('Unable to find Windows SDK root directory. Run in Visual Studio command prompt to avoid the need to autoguess this location.') + raise Exception('Unable to find Windows SDK root directory. Run in Visual Studio command prompt to avoid the need to autoguess this location.') env.setdefault('VSINSTALLDIR', visual_studio_path) env.setdefault('VCINSTALLDIR', os.path.join(visual_studio_path, 'VC')) diff --git a/test/core/FS_exports.cpp b/test/core/FS_exports.cpp index e3a6f774e9360..3fa175dc26855 100644 --- a/test/core/FS_exports.cpp +++ b/test/core/FS_exports.cpp @@ -8,7 +8,7 @@ int main() { #ifdef USE_FILES - if (fopen("nonexistend", "r")) { + if (fopen("nonexistent", "r")) { puts("that was bad"); return 1; } diff --git a/test/core/test_promise_await.c b/test/core/test_promise_await.c index 86bda9b5acdc5..24a9eaf83e048 100644 --- a/test/core/test_promise_await.c +++ b/test/core/test_promise_await.c @@ -5,7 +5,7 @@ #include #include -void fulfill_from_timout(void* arg) { +void fulfill_from_timeout(void* arg) { emscripten_promise_resolve((em_promise_t)arg, EM_PROMISE_FULFILL, (void*)43); } @@ -25,7 +25,7 @@ void test_already_fulfilled() { void test_not_yet_fulfilled() { em_promise_t p = emscripten_promise_create(); - emscripten_async_call(fulfill_from_timout, p, 0); + emscripten_async_call(fulfill_from_timeout, p, 0); printf("waiting on promise: %p\n", p); em_settled_result_t res = emscripten_promise_await(p); diff --git a/test/core/test_signals.c b/test/core/test_signals.c index b7086d0cd73ca..12506bae9c0b3 100644 --- a/test/core/test_signals.c +++ b/test/core/test_signals.c @@ -59,7 +59,7 @@ void test_raise_sigusr1() { } } -void test_sigpenging() { +void test_sigpending() { printf("test_sigpending\n"); recieved1 = false; @@ -157,7 +157,7 @@ int main() { test_sigaction(); test_bad_signal(); test_raise_sigusr1(); - test_sigpenging(); + test_sigpending(); test_sigwaitinfo(); test_sigemptyset(); return 0; diff --git a/test/core/test_varargs.c b/test/core/test_varargs.c index 87f9c0974b131..a83774c67a701 100644 --- a/test/core/test_varargs.c +++ b/test/core/test_varargs.c @@ -43,7 +43,7 @@ void varargs_listoffsets_list_evaluate(int count, va_list ap, int vaIteration) { printf("\n"); } -void varags_listoffsets_list_copy(int count, va_list ap, int iteration) { +void varargs_listoffsets_list_copy(int count, va_list ap, int iteration) { va_list ap_copy; va_copy(ap_copy, ap); varargs_listoffsets_list_evaluate(count, ap_copy, iteration); @@ -55,10 +55,10 @@ void varargs_listoffsets_args(int type, int count, ...) { va_start(ap, count); // evaluate a copied list - varags_listoffsets_list_copy(count, ap, 1); - varags_listoffsets_list_copy(count, ap, 2); - varags_listoffsets_list_copy(count, ap, 3); - varags_listoffsets_list_copy(count, ap, 4); + varargs_listoffsets_list_copy(count, ap, 1); + varargs_listoffsets_list_copy(count, ap, 2); + varargs_listoffsets_list_copy(count, ap, 3); + varargs_listoffsets_list_copy(count, ap, 4); } void varargs_listoffsets_main() { diff --git a/test/emscripten_set_timeout_loop.c b/test/emscripten_set_timeout_loop.c index 1ddf79c21ecdc..50cf1f28ce183 100644 --- a/test/emscripten_set_timeout_loop.c +++ b/test/emscripten_set_timeout_loop.c @@ -4,7 +4,7 @@ #include #include -double previousSetTimeouTime = 0; +double previousSetTimeoutTime = 0; int funcExecuted = 0; void testDone(void *userData) { @@ -14,8 +14,8 @@ void testDone(void *userData) { } bool tick(double time, void *userData) { - assert(time >= previousSetTimeouTime); - previousSetTimeouTime = time; + assert(time >= previousSetTimeoutTime); + previousSetTimeoutTime = time; assert((long)userData == 1); ++funcExecuted; if (funcExecuted == 10) diff --git a/test/fs/test_fs_symlink_resolution.c b/test/fs/test_fs_symlink_resolution.c index 9ef6756652234..bbd8635940bb8 100644 --- a/test/fs/test_fs_symlink_resolution.c +++ b/test/fs/test_fs_symlink_resolution.c @@ -1,7 +1,5 @@ #include #include -#include -#include #include #include #include diff --git a/test/other/test_dlopen_promise.c b/test/other/test_dlopen_promise.c index ae368e0f068e6..acd0910b01077 100644 --- a/test/other/test_dlopen_promise.c +++ b/test/other/test_dlopen_promise.c @@ -6,7 +6,7 @@ #include #include -em_promise_result_t on_fullfilled(void **result, void* data, void *handle) { +em_promise_result_t on_fulfilled(void **result, void* data, void *handle) { printf("onsuccess\n"); int* foo = (int*)dlsym(handle, "foo"); assert(foo); @@ -22,7 +22,7 @@ em_promise_result_t on_rejected(void **result, void* data, void *value) { int main() { em_promise_t inner = emscripten_dlopen_promise("libside.so", RTLD_NOW); - em_promise_t outer = emscripten_promise_then(inner, on_fullfilled, on_rejected, NULL); + em_promise_t outer = emscripten_promise_then(inner, on_fulfilled, on_rejected, NULL); emscripten_promise_destroy(outer); emscripten_promise_destroy(inner); printf("returning from main\n"); diff --git a/test/test_browser.py b/test/test_browser.py index ec46d9d938115..02d3bec9d1015 100644 --- a/test/test_browser.py +++ b/test/test_browser.py @@ -5592,7 +5592,7 @@ def test_cross_origin(self, args, port): create_file('subdir/foo.txt', 'hello') self.compile_btest('hello_world.c', ['-o', 'subdir/hello.js', '-sRUNTIME_DEBUG', '-sCROSS_ORIGIN', '-sPROXY_TO_PTHREAD', '-pthread', '-sEXIT_RUNTIME'] + args) - class MyReqestHandler(SimpleHTTPRequestHandler): + class MyRequestHandler(SimpleHTTPRequestHandler): def __init__(self, *args, **kwargs): super().__init__(*args, directory='subdir', **kwargs) @@ -5616,7 +5616,7 @@ def end_headers(self): else: create_file('test.html', f'') - server = HttpServerThread(ThreadingHTTPServer(('localhost', port), MyReqestHandler)) + server = HttpServerThread(ThreadingHTTPServer(('localhost', port), MyRequestHandler)) server.start() try: self.run_browser('test.html', '/report_result?exit:0') diff --git a/test/test_core.py b/test/test_core.py index b0fea35636ba2..80024a672aa87 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -8731,16 +8731,16 @@ def test_no_declare_asm_module_exports(self): self.maybe_closure() self.do_runf('declare_asm_module_exports.c', 'jsFunction: 1') js = read_file('declare_asm_module_exports.js') - occurances = js.count('cFunction') + occurrences = js.count('cFunction') if self.is_optimizing() and '-g' not in self.cflags: # In optimized builds only the single reference cFunction that exists in the EM_ASM should exist if self.is_wasm(): - self.assertEqual(occurances, 1) + self.assertEqual(occurrences, 1) else: # With js the asm module itself also contains a reference for the cFunction name - self.assertEqual(occurances, 2) + self.assertEqual(occurrences, 2) else: - print(occurances) + print(occurrences) # Tests that -sMINIMAL_RUNTIME works well in different build modes @no_wasmfs('https://github.com/emscripten-core/emscripten/issues/16816') diff --git a/test/test_emscripten_async_wget2.cpp b/test/test_emscripten_async_wget2.cpp index 6b8b9ae4c0206..867132d5f0b0a 100644 --- a/test/test_emscripten_async_wget2.cpp +++ b/test/test_emscripten_async_wget2.cpp @@ -19,8 +19,8 @@ class http { REQUEST_POST , }; - enum AssyncMode { - ASSYNC_THREAD + enum AsyncMode { + ASYNC_THREAD }; // Callback @@ -42,12 +42,12 @@ class http { // Constructor http(const char* hostname, int requestType, const char* targetFilename = "") : _hostname(hostname), _targetFileName(targetFilename), _request((RequestType)requestType), - _status(ST_PENDING), _assync(ASSYNC_THREAD), _uid(uid++) {} + _status(ST_PENDING), _async(ASYNC_THREAD), _uid(uid++) {} /** * Effectue la requete */ - void runRequest(const char* page, int assync); + void runRequest(const char* page, int async); /** * Abort the request @@ -144,7 +144,7 @@ class http { int _progressValue = -1; // current async mode - AssyncMode _assync; + AsyncMode _async; // request handle unsigned _handle; @@ -223,10 +223,10 @@ std::string http::cross_domain = ""; /** * Effectue la requete */ -void http::runRequest(const char* page, int assync) { +void http::runRequest(const char* page, int async) { _page = page; _status = ST_PENDING; - _assync = (AssyncMode)assync; + _async = (AsyncMode)async; _progressValue = 0; std::string url = cross_domain; @@ -343,14 +343,14 @@ int main() { time_elapsed = emscripten_get_now(); http* http1 = new http("https://github.com", http::REQUEST_GET, "emscripten_main.zip"); - http1->runRequest("/emscripten-core/emscripten/archive/main.zip", http::ASSYNC_THREAD); + http1->runRequest("/emscripten-core/emscripten/archive/main.zip", http::ASYNC_THREAD); http* http2 = new http("https://github.com",http::REQUEST_GET, "wolfviking_master.zip"); - http2->runRequest("/wolfviking0/image.js/archive/master.zip", http::ASSYNC_THREAD); + http2->runRequest("/wolfviking0/image.js/archive/master.zip", http::ASYNC_THREAD); http2->abortRequest(); http* http3 = new http("https://raw.github.com", http::REQUEST_GET); - http3->runRequest("/emscripten-core/emscripten/main/LICENSE", http::ASSYNC_THREAD); + http3->runRequest("/emscripten-core/emscripten/main/LICENSE", http::ASYNC_THREAD); num_request++; emscripten_async_call(wait_http, http1, 500); @@ -362,7 +362,7 @@ int main() { /* Http* http4 = new Http("http://www.---.com",Http::REQUEST_POST); http4->addValue("app","123"); - http4->runRequest("/test.php",Http::ASSYNC_THREAD); + http4->runRequest("/test.php",Http::ASYNC_THREAD); num_request ++; emscripten_async_call(wait_http,http4,500); */ diff --git a/test/test_other.py b/test/test_other.py index f4bd9ef19a388..1abc8a8c7d96f 100644 --- a/test/test_other.py +++ b/test/test_other.py @@ -5542,7 +5542,7 @@ def test_fs_dev_random(self): # forced libs is ok, they were there anyhow 'normal': [{'EMCC_FORCE_STDLIBS': 'libc,libc++abi,libc++'}, False], # partial list, but ok since we grab them as needed - 'parial': [{'EMCC_FORCE_STDLIBS': 'libc++'}, False], + 'partial': [{'EMCC_FORCE_STDLIBS': 'libc++'}, False], # fail! not enough stdlibs 'partial_only': [{'EMCC_FORCE_STDLIBS': 'libc++,libc,libc++abi', 'EMCC_ONLY_FORCED_STDLIBS': '1'}, True], # force all the needed stdlibs, so this works even though we ignore the input file @@ -7516,7 +7516,7 @@ def test_dash_s_response_file_list_with_comments(self): create_file('response_file.txt', '_main\n#_nope_ish_nope\n_malloc\n') self.run_process([EMCC, test_file('hello_world.c'), '-sEXPORTED_FUNCTIONS=@response_file.txt']) - def test_dash_s_response_file_misssing(self): + def test_dash_s_response_file_missing(self): expected = 'error: foo: file not found parsing argument: EXPORTED_FUNCTIONS=@foo' self.assert_fail([EMCC, test_file('hello_world.c'), '-sEXPORTED_FUNCTIONS=@foo'], expected) diff --git a/test/webaudio/audioworklet_emscripten_locks.c b/test/webaudio/audioworklet_emscripten_locks.c index 20471eced5f63..61c99af5651dc 100644 --- a/test/webaudio/audioworklet_emscripten_locks.c +++ b/test/webaudio/audioworklet_emscripten_locks.c @@ -28,9 +28,9 @@ typedef enum { // Release in process after above TEST_RELEASE, // Released in process above, spin in main - TEST_WAIT_INFINTE_1, + TEST_WAIT_INFINITE_1, // Release in process to stop spinning in main - TEST_WAIT_INFINTE_2, + TEST_WAIT_INFINITE_2, // Call emscripten_get_now() in process TEST_GET_NOW, // Test finished @@ -93,12 +93,12 @@ bool ProcessAudio(int numInputs, const AudioSampleFrame *inputs, int numOutputs, result = emscripten_lock_try_acquire(&testLock); emscripten_outf("TEST_RELEASE: %d (expect: 1)", result); assert(result); - whichTest = TEST_WAIT_INFINTE_1; + whichTest = TEST_WAIT_INFINITE_1; break; - case TEST_WAIT_INFINTE_1: + case TEST_WAIT_INFINITE_1: // Still locked when we enter here but move on in the main thread break; - case TEST_WAIT_INFINTE_2: + case TEST_WAIT_INFINITE_2: emscripten_lock_release(&testLock); whichTest = TEST_GET_NOW; break; @@ -138,9 +138,9 @@ bool MainLoop(double time, void* data) { didUnlock = true; } break; - case TEST_WAIT_INFINTE_1: + case TEST_WAIT_INFINITE_1: // Spin here until released in process (but don't change test until we know this case ran) - whichTest = TEST_WAIT_INFINTE_2; + whichTest = TEST_WAIT_INFINITE_2; emscripten_lock_busyspin_waitinf_acquire(&testLock); emscripten_out("TEST_WAIT_INFINTE (from main)"); break; diff --git a/tools/system_libs.py b/tools/system_libs.py index 58b692366a305..3cdf76d9af161 100644 --- a/tools/system_libs.py +++ b/tools/system_libs.py @@ -694,14 +694,14 @@ def get_usable_variations(cls): This returns a dictionary of simple names to Library objects. """ - if not hasattr(cls, 'useable_variations'): - cls.useable_variations = {} + if not hasattr(cls, 'usable_variations'): + cls.usable_variations = {} for subclass in cls.get_inheritance_tree(): if subclass.name: library = subclass.get_default_variation() if library.can_build() and library.can_use(): - cls.useable_variations[subclass.name] = library - return cls.useable_variations + cls.usable_variations[subclass.name] = library + return cls.usable_variations class MTLibrary(Library):