Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion embuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion emconfigure.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion emrun.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down
2 changes: 1 addition & 1 deletion emsize.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/audio_worklet.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/lib/libautodebug.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/libccall.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/lib/libembind.js
Original file line number Diff line number Diff line change
Expand Up @@ -1119,7 +1119,7 @@ var LibraryEmbind = {
break;

default:
throwBindingError('Unsupporting sharing policy');
throwBindingError('Unsupported sharing policy');
}
}
return ptr;
Expand Down
2 changes: 1 addition & 1 deletion src/runtime_asan.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/runtime_init_memory.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/runtime_safe_heap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion system/lib/libc/sbrk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion system/lib/libcxxabi/src/cxa_exception.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions test/browser/test_sdl_set_clip_rect.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion test/browser/test_sdl_togglefullscreen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion test/browser/webgl_with_closure.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
2 changes: 1 addition & 1 deletion test/core/pthread/test_pthread_dlopen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion test/core/test_em_asm_2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion test/core/test_em_asm_2.out
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/core/test_externref.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

4 changes: 2 additions & 2 deletions test/core/test_externref.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
in main
log_externref_js: null
extenref stored
externref stored
log_externref_js: {"foo":1}
extenref logged
externref logged
2 changes: 1 addition & 1 deletion test/core/test_wrap_malloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion test/freetype/main_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions test/fs/test_fs_bad_lookup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion test/openal/test_openal_capture.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions test/other/test_mmap_and_munmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand All @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion test/other/test_mmap_and_munmap_anonymous.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
2 changes: 1 addition & 1 deletion test/other/test_pthread_set_main_loop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion test/other/test_pthread_set_main_loop.out
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ loop thread: 9
loop thread: 10
loop thread: 11
loop thread done
joinng..
joining..
join done
2 changes: 1 addition & 1 deletion test/pthread/test_pthread_cancel_cond_wait.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion test/pthread/test_pthread_tls_dylink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions test/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/sockets/test_enet_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion test/sockets/test_enet_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions test/sockets/test_sockets_partial_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void iter() {
return; // try again
}

perror("unexcepted end of data");
perror("unexpected end of data");
finish(EXIT_FAILURE);
}

Expand All @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion test/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Loading