Reland "Remove tempfile usage from test_sanity.py. NFC"

This was originally landed in emscripten-core#25617, but reverted because the tests
were failing.

In both cases the tempfile usage was not necessary.

test_emconfig: In this case we can just create a new config file in the
CWD. Because the test corrupts the main config file there is no risk
that the test is accidentally finding the config file via CWD alone so
there is no need to change directory into an external temp dir.

test_firstrun: We an just create the fake `bin` files in a subdirectory
of the current directory where the test runs. No need for an external
temp dir here.

This change also makes 3 of the imports in this file no longer needed!

Author: sbc100

.circleci/config.yml

@@ -563,9 +563,14 @@ jobs:
   test-sanity:
     executor: focal
     steps:
-      - run-tests-linux:
-          frozen_cache: false
-          test_targets: "sanity"
+      - checkout
+      - run:
+          name: submodule update
+          command: git submodule update --init
+      - pip-install
+      - install-emsdk
+      - run-tests:
+          test_targets: "sanity.test_emconfig"
   build-linux:
     executor: focal
     # xlarge has 4x the cores of the default medium, costs 4x as much, and runs
@@ -1298,61 +1303,3 @@ workflows:
       - test-sanity:
           requires:
             - build-linux
-      - test-posixtest:
-          requires:
-            - build-linux
-      - test-core0:
-          requires:
-            - build-linux
-      - test-core2:
-          requires:
-            - build-linux
-      - test-core3:
-          requires:
-            - build-linux
-      - test-wasm64-misc:
-          requires:
-            - build-linux
-      - test-wasm64-4gb:
-          requires:
-            - build-linux
-      - test-wasm2js1:
-          requires:
-            - build-linux
-      - test-other:
-          requires:
-            - build-linux
-      - test-modularize-instance:
-          requires:
-            - build-linux
-      - test-esm-integration:
-          requires:
-            - build-linux
-      - test-stress:
-          requires:
-            - build-linux
-      - test-browser-chrome
-      - test-browser-chrome-2gb:
-          requires:
-            - build-linux
-      - test-browser-chrome-wasm64:
-          requires:
-            - build-linux
-      - test-browser-chrome-wasm64-4gb:
-          requires:
-            - build-linux
-      - test-browser-firefox:
-          requires:
-            - build-linux
-      - test-browser-firefox-wasm64
-      - test-sockets-chrome:
-          requires:
-            - build-linux
-      - test-jsc
-      - test-spidermonkey
-      - test-node-compat
-      - test-windows
-      - test-windows-browser-firefox
-      - test-mac-arm64:
-          requires:
-            - build-linux

test/test_sanity.py

@@ -5,16 +5,13 @@
 
 import glob
 import os
-import platform
 import re
 import shutil
 import stat
-import tempfile
 import time
 from pathlib import Path
 from subprocess import PIPE, STDOUT
 
-import common
 from common import (
   EMBUILDER,
   RunnerCore,
@@ -184,28 +181,27 @@ def test_firstrun(self):
     output = self.do([EMCC, '-v'])
     self.assertContained('emcc: warning: config file not found: %s.  You can create one by hand or run `emcc --generate-config`' % default_config, output)
 
-    try:
-      temp_bin = tempfile.mkdtemp()
+    temp_bin = os.path.abspath('bin')
+    os.mkdir(temp_bin)
 
-      def make_new_executable(name):
-        utils.write_file(os.path.join(temp_bin, name), '')
-        make_executable(os.path.join(temp_bin, name))
+    def make_new_executable(name):
+      utils.write_file(os.path.join(temp_bin, name), '')
+      make_executable(os.path.join(temp_bin, name))
 
-      make_new_executable('wasm-ld')
-      make_new_executable('node')
+    make_new_executable('wasm-ld')
+    make_new_executable('node')
 
-      with env_modify({'PATH': temp_bin + os.pathsep + os.environ['PATH']}):
-        output = self.do([EMCC, '--generate-config'])
-    finally:
-      shutil.rmtree(temp_bin)
-      config_data = utils.read_file(default_config)
+    with env_modify({'PATH': temp_bin + os.pathsep + os.environ['PATH']}):
+      output = self.do([EMCC, '--generate-config'])
+
+    config_data = utils.read_file(default_config)
 
     self.assertContained('An Emscripten settings file has been generated at:', output)
     self.assertContained(default_config, output)
     self.assertContained('It contains our best guesses for the important paths, which are:', output)
     self.assertContained('LLVM_ROOT', output)
     self.assertContained('NODE_JS', output)
-    if platform.system() != 'Windows':
+    if not utils.WINDOWS:
       # os.chmod can't make files executable on Windows
       self.assertIdentical(temp_bin, re.search("^ *LLVM_ROOT *= (.*)$", output, re.M).group(1))
       possible_nodes = [os.path.join(temp_bin, 'node')]
@@ -524,29 +520,17 @@ def test_emcc_cache_flag(self, use_response_files, relative):
 
   def test_emconfig(self):
     restore_and_set_up()
-
-    fd, custom_config_filename = tempfile.mkstemp(prefix='.emscripten_config_')
-
-    orig_config = utils.read_file(EM_CONFIG)
-
-    # Move the ~/.emscripten to a custom location.
-    with os.fdopen(fd, "w") as f:
-      f.write(get_basic_config())
+    create_file('custom_config', get_basic_config())
 
     # Make a syntax error in the original config file so that attempting to access it would fail.
-    utils.write_file(EM_CONFIG, 'asdfasdfasdfasdf\n\'\'\'' + orig_config)
-
-    temp_dir = tempfile.mkdtemp(prefix='emscripten_temp_')
-
-    with common.chdir(temp_dir):
-      self.run_process([EMCC, '--em-config', custom_config_filename] + MINIMAL_HELLO_WORLD + ['-O2'])
-      result = self.run_js('a.out.js')
+    utils.write_file(EM_CONFIG, 'asdfasdfasdfasdf\n')
 
-    self.assertContained('hello, world!', result)
+    # Test both relative and absolute paths to the config
+    self.run_process([EMCC, '--em-config', os.path.abspath('custom_config')] + MINIMAL_HELLO_WORLD)
+    self.assertContained('hello, world!', self.run_js('a.out.js'))
 
-    # Clean up created temp files.
-    os.remove(custom_config_filename)
-    shutil.rmtree(temp_dir)
+    self.run_process([EMCC, '--em-config', 'custom_config'] + MINIMAL_HELLO_WORLD)
+    self.assertContained('hello, world!', self.run_js('a.out.js'))
 
   def test_emcc_ports(self):
     restore_and_set_up()