diff options
author | Zoltan Varga <vargaz@gmail.com> | 2019-11-13 03:30:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-13 03:30:09 +0300 |
commit | eaf895f2d0ec8c6056ed6b4777579d2e08a8444d (patch) | |
tree | b65ccf6e69f06215d663549843c573deee2c2b6e /scripts/ci | |
parent | bd278dd00dd24b3e8c735a4220afa6cb3ba317ee (diff) |
[wasm] Change netcore support to use a prebuilt corefx runtime. (#17773)
* [wasm] Change netcore support to use a prebuilt corefx runtime.
* [wasm] Build and test netcore support on CI.
* [wasm] Disable netcore tests on CI for now.
* [wasm] Add an error check.
* [wasm] Add a linker exclusion.
* [wasm] Add netcore runtimes to the nupkg.
Diffstat (limited to 'scripts/ci')
-rwxr-xr-x | scripts/ci/run-jenkins.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index 8b582bd8ae5..a849270d530 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -343,6 +343,7 @@ if [[ ${CI_TAGS} == *'webassembly'* ]] || [[ ${CI_TAGS} == *'wasm'* ]]; fi echo "ENABLE_WASM_THREADS=1" >> sdks/Make.config + echo "ENABLE_WASM_NETCORE=1" >> sdks/Make.config export aot_test_suites="System.Core" export mixed_test_suites="System.Core" @@ -373,6 +374,8 @@ if [[ ${CI_TAGS} == *'webassembly'* ]] || [[ ${CI_TAGS} == *'wasm'* ]]; ${TESTCMD} --label=build-aot-all --timeout=20m $gnumake -j ${CI_CPU_COUNT} -C sdks/wasm build-aot-all for suite in ${aot_test_suites}; do ${TESTCMD} --label=run-aot-${suite} --timeout=10m $gnumake -C sdks/wasm run-aot-${suite}; done for suite in ${mixed_test_suites}; do ${TESTCMD} --label=run-aot-mixed-${suite} --timeout=10m $gnumake -C sdks/wasm run-aot-mixed-${suite}; done + # Requires a net 3.0 sdk + #${TESTCMD} --label=netcore --timeout=20m $gnumake -j ${CI_CPU_COUNT} -C sdks/wasm run-hello-netcore #${TESTCMD} --label=check-aot --timeout=20m $gnumake -C sdks/wasm check-aot ${TESTCMD} --label=package --timeout=20m $gnumake -C sdks/wasm package fi |