Merge branch 'main' into cw-audio-test-must-run

Author: cwoffenden

src/jsifier.mjs

@@ -33,6 +33,7 @@ import {
   compileTimeContext,
   printErr,
   readFile,
+  runInMacroContext,
   warn,
   warnOnce,
   warningOccured,
@@ -79,6 +80,19 @@ function stringifyWithFunctions(obj) {
   if (Array.isArray(obj)) {
     return '[' + obj.map(stringifyWithFunctions).join(',') + ']';
   }
+
+  // preserve the type of the object if it is one of [Map, Set, WeakMap, WeakSet].
+  const builtinContainers = runInMacroContext('[Map, Set, WeakMap, WeakSet]', {
+    filename: '<internal>',
+  });
+  for (const container of builtinContainers) {
+    if (obj instanceof container) {
+      const className = container.name;
+      assert(!obj.size, `cannot stringify ${className} with data`);
+      return `new ${className}`;
+    }
+  }
+
   var rtn = '{\n';
   for (const [key, value] of Object.entries(obj)) {
     var str = stringifyWithFunctions(value);

src/lib/libhtml5_webgl.js

@@ -109,7 +109,10 @@ var LibraryHtml5WebGL = {
 #endif
 
     var canvas = findCanvasEventTarget(target);
-
+#if OFFSCREENCANVAS_SUPPORT
+    // If our canvas from findCanvasEventTarget is actually an offscreen canvas record, we should extract the inner canvas.
+    if (canvas?.canvas) { canvas = canvas.canvas; }
+#endif
 #if GL_DEBUG
     var targetStr = UTF8ToString(target);
 #endif

src/lib/libsyscall.js

@@ -794,7 +794,11 @@ var SyscallsLibrary = {
       }
       case {{{ cDefs.F_SETLK }}}:
       case {{{ cDefs.F_SETLKW }}}:
-        return 0; // Pretend that the locking is successful.
+        // Pretend that the locking is successful. These are process-level locks,
+        // and Emscripten programs are a single process. If we supported linking a
+        // filesystem between programs, we'd need to do more here.
+        // See https://github.com/emscripten-core/emscripten/issues/23697
+        return 0;
 #if SYSCALL_DEBUG
       case {{{ cDefs.F_GETOWN_EX }}}:
       case {{{ cDefs.F_SETOWN }}}:

system/lib/libc/emscripten_libc_stubs.c

@@ -147,8 +147,10 @@ weak void setgrent(void) {
 // ==========================================================================
 
 weak int flock(int fd, int operation) {
-  // int flock(int fd, int operation);
-  // Pretend to succeed
+  // Pretend that the locking is successful. These are process-level locks,
+  // and Emscripten programs are a single process. If we supported linking a
+  // filesystem between programs, we'd need to do more here.
+  // See https://github.com/emscripten-core/emscripten/issues/23697
   return 0;
 }
 

system/lib/wasmfs/syscalls.cpp

@@ -1521,8 +1521,11 @@ int __syscall_fcntl64(int fd, int cmd, ...) {
     case F_SETLKW: {
       static_assert(F_SETLK == F_SETLK64);
       static_assert(F_SETLKW == F_SETLKW64);
-      // Always error for now, until we implement byte-range locks.
-      return -EACCES;
+      // Pretend that the locking is successful. These are process-level locks,
+      // and Emscripten programs are a single process. If we supported linking a
+      // filesystem between programs, we'd need to do more here.
+      // See https://github.com/emscripten-core/emscripten/issues/23697
+      return 0;
     }
     default: {
       // TODO: support any remaining cmds

test/browser/webgl_create_context_swapcontrol.c

@@ -23,5 +23,13 @@ int main() {
   EMSCRIPTEN_RESULT res = emscripten_webgl_make_context_current(context);
   assert(res == EMSCRIPTEN_RESULT_SUCCESS);
   assert(emscripten_webgl_get_current_context() == context);
+  emscripten_webgl_destroy_context(context);
+  // Test that creating a context for a canvas that's already been used once succeeds
+  context = emscripten_webgl_create_context("#canvas", &attrs);
+  assert(context > 0); // Must have received a valid context.
+  res = emscripten_webgl_make_context_current(context);
+  assert(res == EMSCRIPTEN_RESULT_SUCCESS);
+  assert(emscripten_webgl_get_current_context() == context);
+  emscripten_webgl_destroy_context(context);
   return 0;
 }

test/common.py

@@ -1167,7 +1167,6 @@ def set_temp_dir(self, temp_dir):
   @classmethod
   def setUpClass(cls):
     super().setUpClass()
-    print('(checking sanity from test runner)') # do this after we set env stuff
     shared.check_sanity(force=True)
 
   def setUp(self):

test/parallel_testsuite.py

@@ -16,6 +16,7 @@
 
 
 NUM_CORES = None
+seen_class = set()
 
 
 def run_test(test):
@@ -24,6 +25,9 @@ def run_test(test):
   temp_dir = tempfile.mkdtemp(prefix='emtest_')
   test.set_temp_dir(temp_dir)
   try:
+    if test.__class__ not in seen_class:
+      seen_class.add(test.__class__)
+      test.__class__.setUpClass()
     test(result)
   except unittest.SkipTest as e:
     result.addSkip(test, e)

test/sqlite/test.c

@@ -32,20 +32,22 @@ int main(){
     NULL
   };
 
-  rc = sqlite3_open(":memory:", &db);
-  if( rc ){
-    fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db));
+  rc = sqlite3_open("test.db", &db);
+  if (rc) {
+    printf("Can't open database: %s\n", sqlite3_errmsg(db));
     sqlite3_close(db);
     exit(1);
   }
+
   for (i = 0; commands[i]; i++) {
     rc = sqlite3_exec(db, commands[i], callback, 0, &zErrMsg);
-    if( rc!=SQLITE_OK ){
-      fprintf(stderr, "SQL error on %d: %s\n", i, zErrMsg);
+    if (rc != SQLITE_OK){
+      printf("SQL error on %d: %s\n", i, zErrMsg);
       sqlite3_free(zErrMsg);
       exit(1);
     }
   }
+
   sqlite3_close(db);
   return 0;
 }

test/sqlite/benchmark.out renamed to test/sqlite/test.out

@@ -1,7 +1,5 @@
 count(*) = 2
 
-datetime('2012-04-16 12:35:57', '+1 days') = 2012-04-17 12:35:57
-
 a = 1
 b = 13153
 c = thirteen thousand one hundred fifty three