Fix browser.test_modularize

emscripten-core · juj · Mar 5, 2024 · Mar 5, 2024 · Mar 6, 2024 · Mar 6, 2024
commit a27937f70bc9dfca80acb7552546e90c61911f58
diff --git a/src/preamble.js b/src/preamble.js
@@ -595,9 +595,12 @@ var wasmBinaryFile;
 if (Module['locateFile']) {
 #endif
   wasmBinaryFile = '{{{ WASM_BINARY_FILE }}}';
+#if !SINGLE_FILE
   if (!isDataURI(wasmBinaryFile)) {
     wasmBinaryFile = locateFile(wasmBinaryFile);
   }
+#endif
+
 #if EXPORT_ES6 && USE_ES6_IMPORT_META && !SINGLE_FILE && !AUDIO_WORKLET // In single-file mode, repeating WASM_BINARY_FILE would emit the contents again. For an Audio Worklet, we cannot use `new URL()`.
 } else {
 #if ENVIRONMENT_MAY_BE_SHELL
@@ -612,11 +615,12 @@ if (Module['locateFile']) {
 
 #if SINGLE_FILE && SINGLE_FILE_BINARY_ENCODE
 function binaryDecode(bin) { for(var i=0,l=bin.length,o=new Uint8Array(l);i<l;++i) o[i]=bin.charCodeAt(i)-1; return o; }
+wasmBinaryFile = binaryDecode(wasmBinaryFile);
 #endif
 
 function getBinarySync(file) {
 #if SINGLE_FILE && SINGLE_FILE_BINARY_ENCODE
-  return binaryDecode(file);
+  return file;
 #else
   if (file == wasmBinaryFile && wasmBinary) {
     return new Uint8Array(wasmBinary);

diff --git a/test/test_browser.py b/test/test_browser.py
@@ -3421,10 +3421,12 @@ def test_modularize(self):
         # this test is synchronous, so avoid async startup due to wasm features
         self.compile_btest('browser_test_hello_world.c', ['-sMODULARIZE', '-sSINGLE_FILE'] + args + opts)
         create_file('a.html', '''
+          <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"></head><body>
           <script src="a.out.js"></script>
           <script>
             %s
           </script>
+          </body></html>
         ''' % code)
         self.run_browser('a.html', '/report_result?0')