Run one websockify test on macOS during CI. NFC (#16395)

This requires more consistent running of `pip install`

Author: sbc100

.circleci/config.yml

@@ -47,8 +47,15 @@ commands:
       - run: npm ci
   pip-install:
     description: "pip install"
+    parameters:
+      python:
+        description: "Python executable to use"
+        type: string
+        default: python3
     steps:
-      - run: pip3 install -r requirements-dev.txt
+      - run:
+          name: pip install
+          command: << parameters.python >> -m pip install -r requirements-dev.txt
   build:
     description: "Install emsdk"
     steps:
@@ -93,6 +100,7 @@ commands:
   build-libs-and-freeze:
     description: "Build all libraries, and freeze the cache"
     steps:
+      - pip-install
       - run:
           name: embuilder build ALL
           command: |
@@ -134,12 +142,8 @@ commands:
             - vms/
             - wasi-sdk/
             - .jsvu/
-  run-tests:
-    description: "Runs emscripten tests"
-    parameters:
-      test_targets:
-        description: "Test suites to run"
-        type: string
+  prepare-for-tests:
+    description: "Setup emscripten tests"
     steps:
       - attach_workspace:
           # Must be absolute path or relative path from working_directory
@@ -150,49 +154,33 @@ commands:
           command: git submodule update --init
       - emsdk-env
       - npm-install
-      - run:
-          name: run tests
-          command: |
-            ./tests/runner << parameters.test_targets >>
-            $EMSDK_PYTHON ./tools/check_clean.py
-  run-tests-mac:
+      - pip-install
+  run-tests:
     description: "Runs emscripten tests"
     parameters:
       test_targets:
         description: "Test suites to run"
         type: string
     steps:
-      - attach_workspace:
-          # Must be absolute path or relative path from working_directory
-          at: ~/
-      - checkout
-      - emsdk-env
-      - npm-install
-      - run:
-          name: Install brew package dependencies
-          environment:
-            HOMEBREW_NO_AUTO_UPDATE: "1"
-          command: |
-            brew list cmake || brew install cmake
-            brew list python3 || brew install python3
       - run:
           name: run tests
           command: |
             ./tests/runner << parameters.test_targets >>
             $EMSDK_PYTHON ./tools/check_clean.py
+  run-tests-linux:
+    description: "Runs emscripten tests"
+    parameters:
+      test_targets:
+        description: "Test suites to run"
+        type: string
+    steps:
+      - prepare-for-tests
+      - run-tests:
+          test_targets: << parameters.test_targets >>
   test-firefox:
     description: "Runs emscripten tests under firefox"
     steps:
-      - attach_workspace:
-          # Must be absolute path or relative path from working_directory
-          at: ~/
-      - checkout
-      - run:
-          name: submodule update
-          command: git submodule update --init
-      - emsdk-env
-      - npm-install
-      - pip-install
+      - prepare-for-tests
       - run:
           name: download firefox
           command: |
@@ -242,16 +230,7 @@ commands:
   test-chrome:
     description: "Runs emscripten browser tests under chrome"
     steps:
-      - attach_workspace:
-          # Must be absolute path or relative path from working_directory
-          at: ~/
-      - checkout
-      - run:
-          name: submodule update
-          command: git submodule update --init
-      - emsdk-env
-      - npm-install
-      - pip-install
+      - prepare-for-tests
       - download-chrome
       - run:
           name: run tests
@@ -274,13 +253,7 @@ commands:
   test-sockets-chrome:
     description: "Runs emscripten sockets tests under chrome"
     steps:
-      - attach_workspace:
-          # Must be absolute path or relative path from working_directory
-          at: ~/
-      - checkout
-      - emsdk-env
-      - npm-install
-      - pip-install
+      - prepare-for-tests
       - download-chrome
       - run:
           name: run sockets tests
@@ -321,7 +294,7 @@ jobs:
   test-sanity:
     executor: bionic
     steps:
-      - run-tests:
+      - run-tests-linux:
           test_targets: "sanity"
   build-linux:
     executor: bionic
@@ -366,7 +339,7 @@ jobs:
   test-posixtest:
     executor: bionic
     steps:
-      - run-tests:
+      - run-tests-linux:
           test_targets: "posixtest"
   test-core0:
     executor: bionic
@@ -375,37 +348,37 @@ jobs:
     environment:
       EMCC_READ_METADATA: "compare"
     steps:
-      - run-tests:
+      - run-tests-linux:
           test_targets: "core0"
   test-core2:
     executor: bionic
     environment:
       EMTEST_BROWSER: "node"
     steps:
-      - run-tests:
+      - run-tests-linux:
           # also add a few asan tests and a single test of EMTEST_BROWSER=node
           test_targets: "core2 asan.test_stat asan.test_float_builtins asan.test_embind* asan.test_abort_on_exceptions asan.test_ubsan_full_left_shift_fsanitize_integer asan.test_pthread* asan.test_dyncall_specific_minimal_runtime asan.test_async_hello lsan.test_stdio_locking lsan.test_pthread_create browser.test_pthread_join"
   test-core3:
     executor: bionic
     steps:
-      - run-tests:
+      - run-tests-linux:
           # also add a little select testing for wasm2js in -O3
           # also add a little select wasmfs testing
           test_targets: "core3 wasm2js3.test_memorygrowth_2 wasmfs.test_hello_world wasmfs.test_hello_world_standalone wasmfs.test_unistd_links* wasmfs.test_atexit_standalone wasmfs.test_emscripten_get_now wasmfs.test_dyncall_specific_minimal_runtime core2ss.test_pthread_dylink wasmfs.test_utime wasmfs.test_unistd_unlink wasmfs.test_unistd_access wasmfs.test_unistd_close wasmfs.test_unistd_truncate wasmfs.test_readdir wasmfs.test_unistd_pipe"
   test-wasm2js1:
     executor: bionic
     steps:
-      - run-tests:
+      - run-tests-linux:
           test_targets: "wasm2js1"
   test-wasm64:
     executor: bionic
     steps:
-      - run-tests:
+      - run-tests-linux:
           test_targets: "wasm64.test_hello_world"
   test-other:
     executor: bionic
     steps:
-      - run-tests:
+      - run-tests-linux:
           # some native-dependent tests fail because of the lack of native
           # headers on emsdk-bundled clang
           test_targets: "other skip:other.test_native_link_error_message"
@@ -468,8 +441,10 @@ jobs:
       - build
       # note we do *not* build all libraries and freeze the cache; as we run
       # only limited tests here, it's more efficient to build on demand
-      - run-tests-mac:
-          test_targets: "other core0.test_lua core0.test_longjmp_standalone core2.test_sse1 skip:other.test_native_link_error_message"
+      - pip-install:
+          python: "$EMSDK_PYTHON"
+      - run-tests:
+          test_targets: "other sockets.test_nodejs_sockets_echo core0.test_lua core0.test_longjmp_standalone core2.test_sse1 skip:other.test_native_link_error_message"
 
 workflows:
   build-test:

tests/test_sockets.py

@@ -9,7 +9,7 @@
 import shutil
 import sys
 import time
-from subprocess import Popen, PIPE
+from subprocess import Popen
 
 if __name__ == '__main__':
   raise Exception('do not run this file directly; do something like: tests/runner sockets')
@@ -60,8 +60,7 @@ def __enter__(self):
     # NOTE empty filename support is a hack to support
     # the current test_enet
     if self.filename:
-      proc = run_process([CLANG_CC, test_file(self.filename), '-o', 'server', '-DSOCKK=%d' % self.target_port] + clang_native.get_clang_native_args() + self.args, clang_native.get_clang_native_env(), stdout=PIPE, stderr=PIPE)
-      print('Socket server build: out:', proc.stdout, '/ err:', proc.stderr)
+      run_process([CLANG_CC, test_file(self.filename), '-o', 'server', '-DSOCKK=%d' % self.target_port] + clang_native.get_clang_native_args() + self.args, env=clang_native.get_clang_native_env())
       process = Popen([os.path.abspath('server')])
       self.processes.append(process)