Skip to content

Commit 511931f

Browse files
authored
Add minimal windows testing to CI (#10293)
This adds some *very* minimal windows testing which should allow us to debug the closure compiler issues we are seeing on the emscripten-releases tree.
1 parent d8bd810 commit 511931f

File tree

1 file changed

+25
-11
lines changed

1 file changed

+25
-11
lines changed

.circleci/config.yml

+25-11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ executors:
1111
LANG: "C.UTF-8"
1212
EMTEST_DETECT_TEMPFILE_LEAKS: "1"
1313
EMCC_CORES: "4"
14+
EMSDK_NOTTY: "1"
15+
PYTHON_BIN: "python2"
16+
mac:
17+
environment:
18+
EMSDK_NOTTY: "1"
19+
PYTHON_BIN: "python3"
20+
macos:
21+
xcode: "9.0"
1422

1523
commands:
1624
npm-install:
@@ -105,8 +113,8 @@ commands:
105113
- run:
106114
name: run tests
107115
command: |
108-
python3 tests/runner.py << parameters.test_targets >>
109-
tools/check_clean.py
116+
$PYTHON_BIN tests/runner.py << parameters.test_targets >>
117+
$PYTHON_BIN tools/check_clean.py
110118
run-tests-mac:
111119
description: "Runs emscripten tests"
112120
parameters:
@@ -426,9 +434,6 @@ jobs:
426434
test_targets: "sanity"
427435
build-upstream-linux:
428436
executor: bionic
429-
environment:
430-
EMSDK_NOTTY: "1"
431-
PYTHON_BIN: "python2"
432437
steps:
433438
- checkout
434439
- run:
@@ -513,12 +518,19 @@ jobs:
513518
name: Add python to bash path
514519
command: echo "export PATH=\"$PATH:/c/python27amd64/\"" >> $BASH_ENV
515520
- build-upstream
516-
build-upstream-mac:
517-
macos:
518-
xcode: "9.0"
521+
test-upstream-other-windows:
519522
environment:
523+
PYTHON_BIN: "/c/python27amd64/python.exe"
524+
PYTHONUNBUFFERED: "1"
520525
EMSDK_NOTTY: "1"
521-
PYTHON_BIN: "python3"
526+
executor:
527+
name: win/vs2019
528+
shell: bash.exe
529+
steps:
530+
- run-tests:
531+
test_targets: "other.test_closure_externs other.test_binaryen_debug"
532+
build-upstream-mac:
533+
executor: mac
522534
steps:
523535
- run:
524536
name: Install brew package dependencies
@@ -528,8 +540,7 @@ jobs:
528540
- checkout
529541
- build-upstream
530542
test-upstream-other-mac:
531-
macos:
532-
xcode: "9.0"
543+
executor: mac
533544
steps:
534545
- run-tests-mac:
535546
test_targets: "other skip:other.test_native_link_error_message skip:other.test_emcc_v"
@@ -617,6 +628,9 @@ workflows:
617628
requires:
618629
- build-upstream-linux
619630
- build-upstream-windows
631+
- test-upstream-other-windows:
632+
requires:
633+
- build-upstream-windows
620634
- build-upstream-mac
621635
- test-upstream-other-mac:
622636
requires:

0 commit comments

Comments
 (0)