Removing shell correctly.

seanmorris · seanmorris · commit c3fadbc6e690 · 2024-09-17T00:43:04.000-04:00
diff --git a/test/test_browser.py b/test/test_browser.py
@@ -5396,52 +5396,23 @@ def test_fetch_polyfill_preload(self):
         buf[20] = 0;
         fclose(f);
         printf("|%%s|\n", buf);
-        return 0;
+        return 42;
       }
       ''' % path)
-    create_file('on_window_error_shell.html', r'''
-      <html>
-          <center><canvas id='canvas' width='256' height='256'></canvas></center>
-          <hr><div id='output'></div><hr>
-          <script type='text/javascript'>
-            window.addEventListener('error', event => {
-              const error = String(event.message);
-              console.log({error});
-              window.disableErrorReporting = true;
-              window.onerror = null;
-              var xhr = new XMLHttpRequest();
-              xhr.open('GET', 'http://localhost:8888/report_result?' + (error.includes('fetch is not a function') ? 1 : 0), true);
-              xhr.send();
-              setTimeout(function() { window.close() }, 1000);
-            });
-            var Module = {
-              print: (function() {
-                var element = document.getElementById('output');
-                return function(text) {
-                  console.log({text});
-                  if(window.disableErrorReporting) return;
-                  element.innerHTML += text.replace('\n', '<br>', 'g') + '<br>';
-                  var xhr = new XMLHttpRequest();
-                  xhr.open('GET', 'http://localhost:8888/report_result?' + (text === '|hello, world!|' ? 1 : 0), true);
-                  xhr.send();
-                };
-              })(),
-              canvas: document.getElementById('canvas')
-            };
-          </script>
-          {{{ SCRIPT }}}
-        </body>
-      </html>''')
 
     def test(args, expect_fail):
-      self.compile_btest('main.cpp', args + ['--preload-file', path, '--shell-file', 'on_window_error_shell.html', '-o', 'a.out.html'])
+      self.compile_btest('main.cpp', args + ['--preload-file', path, '-o', 'a.out.html'])
       if expect_fail:
         js = read_file('a.out.js')
         create_file('a.out.js', 'fetch = undefined;\n' + js)
-        return self.run_browser('a.out.html', '/report_result?0')
+        return self.run_browser('a.out.html', '/report_result?exception:fetch is not a function')
       else:
-        return self.run_browser('a.out.html', '/report_result?1')
-
+        return self.run_browser('a.out.html', '/report_result?42')
+  
+    test([], expect_fail=False)
+    test(['-sLEGACY_VM_SUPPORT'], expect_fail=False)
+    test(['-sLEGACY_VM_SUPPORT', '-sNO_POLYFILL'], expect_fail=True)
+  
   @no_wasm64('https://github.com/llvm/llvm-project/issues/98778')
   def test_fetch_polyfill_shared_lib(self):
     create_file('library.c', r'''
