wip web [ci skip]

Author: kripken

emcc.py

@@ -841,9 +841,18 @@ def setting_sub(s):
       wasm_text_target = asm_target.replace('.asm.js', '.wast') # ditto, might not be used
       wasm_binary_target = asm_target.replace('.asm.js', '.wasm') # ditto, might not be used
 
-      if final_suffix == 'html' and not options.separate_asm and ('PRECISE_F32=2' in settings_changes or 'USE_PTHREADS=2' in settings_changes):
-        options.separate_asm = True
-        logging.warning('forcing separate asm output (--separate-asm), because -s PRECISE_F32=2 or -s USE_PTHREADS=2 was passed.')
+      if final_suffix == 'html':
+        if shared.Settings.ENVIRONMENT:
+          if shared.Settings.ENVIRONMENT != 'web':
+            logging.warning('Output is HTML, but ENVIRONMENT was set to "%s" != "web"' % shared.Settings.ENVIRONMENT)
+        else:
+          logging.debug('Output is HTML, so setting ENVIRONMENT to "web" (the .js will not run off the web)')
+          shared.Settings.ENVIRONMENT = 'web'
+
+        if not options.separate_asm and ('PRECISE_F32=2' in settings_changes or 'USE_PTHREADS=2' in settings_changes):
+          options.separate_asm = True
+          logging.warning('forcing separate asm output (--separate-asm), because -s PRECISE_F32=2 or -s USE_PTHREADS=2 was passed.')
+
       if options.separate_asm:
         shared.Settings.SEPARATE_ASM = shared.JS.get_subresource_location(asm_target)
 

tests/test_browser.py

@@ -3895,3 +3895,29 @@ def test_unicode_html_shell(self):
     open(self.in_dir('shell.html'), 'w').write(open(path_from_root('src', 'shell.html')).read().replace('Emscripten-Generated Code', 'Emscripten-Generated Emoji 😅'))
     subprocess.check_output([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.cpp'), '--shell-file', 'shell.html', '-o', 'test.html'])
     self.run_browser('test.html', None, '/report_result?0')
+
+  def test_ENVIRONMENT(self):
+    for work in (1, 0):
+      for assertions in (0, 1):
+        if work and assertions: continue # we care about assertions when we fail
+        # tell the compiler to build with just that engine
+        args = []
+        if work:
+          args += ['-s', 'ENVIRONMENT="web"']
+        else:
+          args += ['-s', 'ENVIRONMENT="node"']
+        if assertions:
+          args += ['-s', 'ASSERTIONS=1']
+        print(work, assertions, args)
+        try:
+          self.btest('browser_test_hello_world.c', expected='0', args=args)
+        except Exception as e:
+          if not work:
+            if assertions:
+              # with assertions, an error should be shown
+              self.assertContained('not compiled with support for that', str(e))
+          else:
+            raise
+        js = open('src.cpp.o.js').read()
+        assert ('require(' in js) == ('node' in str(args)), 'we should have require() calls only if node js specified'
+