VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-08 03:27:04 +09:00
Code Activity

Run WASM tests with xharness (#37346)

Browse source 
Uses the xharness tool to drive the test execution rather than calling v8 directly.
Also includes a fix for running the tests in JavaScriptCore which doesn't provide performance.now().
This commit is contained in:
Alexander Köplinger 2020-06-03 16:28:31 +02:00 • committed by GitHub
parent 7e01dcb92c
commit 33be17f200
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.config/dotnet-tools.json
View file

@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.20279.2",
"version": "1.0.0-prerelease.20303.2",
"commands": [
"xharness"
]

4
eng/Version.Details.xml
View file

@ -174,9 +174,9 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>95d8c21c8d9bfc8cad107ff36fa44851f61bb28c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20301.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20303.2">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>bf873c70b1f983f4c9c7280ccb0481142ef64206</Sha>
<Sha>2de89cbfa1ad6f5003ba524d520a29d690fa04e7</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

2
eng/Versions.props
View file

@ -106,7 +106,7 @@
<SystemDataSqlClientVersion>4.8.0</SystemDataSqlClientVersion>
<!-- Testing -->
<MicrosoftNETTestSdkVersion>16.7.0-preview-20200529-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20301.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20303.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
<TraceEventVersion>2.0.5</TraceEventVersion>

16
eng/testing/WasmRunnerTemplate.sh
View file

@ -1,10 +1,20 @@
set -ev
#!/usr/bin/env bash
EXECUTION_DIR=$(dirname $0)
echo "Test: $1"
cd $EXECUTION_DIR
v8 --expose_wasm runtime.js -- --enable-gc --run WasmTestRunner.dll $*
exit 0
XHARNESS_OUT="$EXECUTION_DIR/xharness-output"
dotnet xharness wasm test --engine=v8 \
--js-file=runtime.js \
--output-directory=$XHARNESS_OUT \
-- --enable-gc --run WasmTestRunner.dll $*
_exitCode=$?
echo "Xharness artifacts: $XHARNESS_OUT"
exit $_exitCode

2
src/mono/wasm/Makefile
View file

@ -120,4 +120,4 @@ app-builder:
$(DOTNET) build $(TOP)/tools-local/tasks/mobile.tasks/WasmAppBuilder
run-tests-%:
PATH="$(JSVU):$(PATH)" $(DOTNET) build $(TOP)/src/libraries/$*/tests/ /t:Test /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=Release
PATH="$(JSVU):$(PATH)" $(DOTNET) build $(TOP)/src/libraries/$*/tests/ /t:Test /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=$(CONFIG)

9
src/mono/wasm/runtime-test.js
View file

@ -48,6 +48,15 @@ if (typeof crypto == 'undefined') {
}
}
if (typeof performance == 'undefined') {
// performance.now() is used by emscripten and doesn't work in JSC
var performance = {
now: function () {
return Date.now ();
}
}
}
try {
if (typeof arguments == "undefined")
arguments = WScript.Arguments;