Skip to content

Add a BundleTestWasmApp target to build wasm test apps for libraries. #36739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 7 commits into from
May 27, 2020
Merged

Add a BundleTestWasmApp target to build wasm test apps for libraries. #36739

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ded202
Add a BundleTestWasmApp target to build wasm test apps for libraries.
vargaz May 20, 2020
2cf5417
Move runtime.js to src/mono/wasm, rename to runtime-test.js.
vargaz May 20, 2020
1763bfb
Add a wasm runner template.
vargaz May 20, 2020
52f3ea3
Fix make runtimepack.
vargaz May 25, 2020
b19c140
Get runtime-test.js from mono/wasm.
vargaz May 26, 2020
6b260e3
Add beginnings of WasmTestRunner app.
vargaz May 27, 2020
c87908e
Address comments.
vargaz May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Get runtime-test.js from mono/wasm.
  • Loading branch information
@vargaz
vargaz committed May 27, 2020
commit b19c1401bcbd013bade5329672cc650ccd75948c
6 changes: 3 additions & 3 deletions eng/testing/tests.mobile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@
<WasmAppBuilder
AppDir="$(BundleDir)"
RuntimePackDir="$(RuntimePackRidDir)"
MainAssembly="$(PublishDir)\xunit-runner.dll"
MainJS="$(RuntimePackRidDir)\native\wasm\runtime-test.js"
ExtraAssemblies="$(PublishDir)\System.Numerics.Vectors.Tests.dll"
MainAssembly="$(PublishDir)\Microsoft.DotNet.XHarness.WebAssembly.dll"
MainJS="$(MonoProjectRoot)\wasm\runtime-test.js"
ExtraAssemblies="$(PublishDir)\$(AssemblyName).dll"
AssemblySearchPaths="@(AssemblySearchPaths)"/>
<Exec Command="chmod a+x $(BundleDir)/run-v8.sh" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion src/mono/netcore/sample/wasm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ run:
cd bin/$(CONFIG)/publish && ~/.jsvu/v8 --expose_wasm runtime.js -- --enable-gc --run WasmSample.dll

runtimepack:
EMSDK_PATH=$(absdir $(TOP)/src/mono/wasm/emsdk) $(TOP)/build.sh -c $(CONFIG) -os Browser -arch wasm -subset Mono+Libs
EMSDK_PATH=$(abspath $(TOP)/src/mono/wasm/emsdk) $(TOP)/build.sh -c $(CONFIG) -os Browser -arch wasm -subset Mono+Libs
2 changes: 1 addition & 1 deletion src/mono/netcore/sample/wasm/WasmSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
AppDir="$(AppDir)"
RuntimePackDir="$(RuntimePackDir)"
MainAssembly="bin\WasmSample.dll"
MainJS="$(RuntimePackDir)\native\wasm\runtime-test.js"
MainJS="$(MonoProjectRoot)\wasm\runtime-test.js"
AssemblySearchPaths="@(AssemblySearchPaths)"/>
<Exec Command="chmod a+x $(AppDir)/run-v8.sh" />
</Target>
Expand Down
5 changes: 0 additions & 5 deletions src/mono/wasm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,6 @@ endef
$(eval $(call InterpBuildTemplate,debug,,$(EMCC_DEBUG_FLAGS),$(MONO_LIBS)))
$(eval $(call InterpBuildTemplate,release,,$(EMCC_RELEASE_FLAGS),$(MONO_LIBS)))

$(BUILDS_BIN_DIR)/runtime-test.js: runtime-test.js
cp runtime-test.js $@

build-native: $(BUILDS_BIN_DIR)/runtime-test.js

build:
EMSDK_PATH=$(PWD)/wasm/emsdk ../../../.dotnet/dotnet build /p:TargetArchitecture=wasm /p:TargetOS=Browser /p:Configuration=$(CONFIG)

Expand Down