diff options
| author | Morgan Brown <morganbr@users.noreply.github.com> | 2018-03-06 03:50:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 03:50:28 +0300 |
| commit | ce9cd701b13774174765f731834fb2cb1cf8ebfc (patch) | |
| tree | d8b9fbe1af5c54646d83d6ff1735a133a7b0c7f8 | |
| parent | 4e0a3e661063c88a14e9599929bbbf4d635c5a20 (diff) | |
Automatic WebAssembly test execution (#5492)
* Automatically execute WebAssembly tests on Windows by using emrun to launch a headless instance of Firefox (which doesn't interfere with any other Firefox usage). This should cut down on manual testing and help us move toward CI integration.
| -rw-r--r-- | Documentation/how-to-build-WebAssembly.md | 1 | ||||
| -rw-r--r-- | src/BuildIntegration/Microsoft.NETCore.Native.targets | 2 | ||||
| -rw-r--r-- | tests/runtest.cmd | 13 | ||||
| -rw-r--r-- | tests/src/Simple/HelloWasm/HelloWasm.cmd | 13 |
4 files changed, 18 insertions, 11 deletions
diff --git a/Documentation/how-to-build-WebAssembly.md b/Documentation/how-to-build-WebAssembly.md index 84e6ed6df..075ef3c21 100644 --- a/Documentation/how-to-build-WebAssembly.md +++ b/Documentation/how-to-build-WebAssembly.md @@ -4,6 +4,7 @@ 1. Install Emscripten by following the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). 2. Follow the instructions [here](https://kripken.github.io/emscripten-site/docs/getting_started/downloads.html#updating-the-sdk) to update Emscripten to the latest version. +3. Install [Firefox](https://www.getfirefox.com) (for testing). 3. Get CoreRT set up by following the [Visual Studio instructions](how-to-build-and-run-ilcompiler-in-visual-studio.md). 4. Build the WebAssembly runtime by running ```build.cmd wasm``` from the repo root. 5. Run the WebAssembly "Hello World" test by running ```C:\corert\tests\runtest.cmd wasm```. diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets index 23b817c7a..0e3d59ec4 100644 --- a/src/BuildIntegration/Microsoft.NETCore.Native.targets +++ b/src/BuildIntegration/Microsoft.NETCore.Native.targets @@ -224,7 +224,7 @@ See the LICENSE file in the project root for more information. <Exec Command="$(CppLibCreator) @"$(NativeIntermediateOutputPath)lib.rsp"" Condition="'$(OS)' == 'Windows_NT' and '$(NativeLib)' == 'Static' and '$(NativeCodeGen)' != 'wasm'" /> <PropertyGroup> - <EmccArgs>"$(NativeObject)" -o "$(NativeBinary)" -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 </EmccArgs> + <EmccArgs>"$(NativeObject)" -o "$(NativeBinary)" -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 --emrun </EmccArgs> <EmccArgs Condition="'$(Platform)'=='wasm'">$(EmccArgs) "$(IlcPath)/sdk/libPortableRuntime.bc" "$(IlcPath)/sdk/libbootstrappercpp.bc" </EmccArgs> <EmccArgs Condition="'$(Configuration)'=='Release'">$(EmccArgs) -O2 --llvm-lto 2</EmccArgs> <EmccArgs Condition="'$(Configuration)'=='Debug'">$(EmccArgs) -g3</EmccArgs> diff --git a/tests/runtest.cmd b/tests/runtest.cmd index 0c23b18a7..7550edc94 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -301,12 +301,19 @@ goto :eof set __SavedErrorLevel=!ErrorLevel! if "%CoreRT_TestRun%"=="false" (goto :SkipTestRun) - if "%__Mode%" == "wasm" (goto :SkipTestRun) + + set __Extension=exe + + if "%__Mode%"=="wasm" ( + REM Skip running if this is WASM build-only testing running in a different architecture's build + if /i not "%CoreRT_BuildArch%"=="wasm" (goto :SkipTestRun) + set __Extension=html + ) - if "%__SavedErrorLevel%"=="0" ( + if "!__SavedErrorLevel!"=="0" ( echo. echo Running test !__SourceFileName! - call !__SourceFile!.cmd !__SourceFolder!\bin\%CoreRT_BuildType%\%CoreRT_BuildArch%\native !__SourceFileName!.exe + call !__SourceFile!.cmd !__SourceFolder!\bin\%CoreRT_BuildType%\%CoreRT_BuildArch%\native !__SourceFileName!.!__Extension! set __SavedErrorLevel=!ErrorLevel! ) ) diff --git a/tests/src/Simple/HelloWasm/HelloWasm.cmd b/tests/src/Simple/HelloWasm/HelloWasm.cmd index 286a11ffc..3b6590585 100644 --- a/tests/src/Simple/HelloWasm/HelloWasm.cmd +++ b/tests/src/Simple/HelloWasm/HelloWasm.cmd @@ -1,14 +1,13 @@ @echo off setlocal -set ErrorCode=100 -for /f "usebackq delims=;" %%F in (`"%1\%2" world`) do ( - if "%%F"=="Hello world" set ErrorCode=0 -) -IF "%ErrorCode%"=="0" ( - echo %~n0: pass + +call emrun --browser=firefox --browser_args=-headless --safe_firefox_profile --silence_timeout 10 "%1\%2" + +IF "%errorlevel%"=="42" ( + echo %~n0: Pass EXIT /b 0 ) ELSE ( - echo %~n0: fail - %ErrorCode% + echo %~n0: fail - %ErrorLevel% EXIT /b 1 ) endlocal |