@@ -11,6 +11,14 @@ executors:
11
11
LANG : " C.UTF-8"
12
12
EMTEST_DETECT_TEMPFILE_LEAKS : " 1"
13
13
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"
14
22
15
23
commands :
16
24
npm-install :
@@ -105,8 +113,8 @@ commands:
105
113
- run :
106
114
name : run tests
107
115
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
110
118
run-tests-mac :
111
119
description : " Runs emscripten tests"
112
120
parameters :
@@ -426,9 +434,6 @@ jobs:
426
434
test_targets : " sanity"
427
435
build-upstream-linux :
428
436
executor : bionic
429
- environment :
430
- EMSDK_NOTTY : " 1"
431
- PYTHON_BIN : " python2"
432
437
steps :
433
438
- checkout
434
439
- run :
@@ -513,12 +518,19 @@ jobs:
513
518
name : Add python to bash path
514
519
command : echo "export PATH=\"$PATH:/c/python27amd64/\"" >> $BASH_ENV
515
520
- build-upstream
516
- build-upstream-mac :
517
- macos :
518
- xcode : " 9.0"
521
+ test-upstream-other-windows :
519
522
environment :
523
+ PYTHON_BIN : " /c/python27amd64/python.exe"
524
+ PYTHONUNBUFFERED : " 1"
520
525
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
522
534
steps :
523
535
- run :
524
536
name : Install brew package dependencies
@@ -528,8 +540,7 @@ jobs:
528
540
- checkout
529
541
- build-upstream
530
542
test-upstream-other-mac :
531
- macos :
532
- xcode : " 9.0"
543
+ executor : mac
533
544
steps :
534
545
- run-tests-mac :
535
546
test_targets : " other skip:other.test_native_link_error_message skip:other.test_emcc_v"
@@ -617,6 +628,9 @@ workflows:
617
628
requires :
618
629
- build-upstream-linux
619
630
- build-upstream-windows
631
+ - test-upstream-other-windows :
632
+ requires :
633
+ - build-upstream-windows
620
634
- build-upstream-mac
621
635
- test-upstream-other-mac :
622
636
requires :
0 commit comments