|
8 | 8 | <WasmSingleFileBundle Condition="'$(WasmSingleFileBundle)' == ''">false</WasmSingleFileBundle> |
9 | 9 | <WasmMainAssemblyFileName Condition="'$(WasmMainAssemblyFileName)' == ''">WasmTestRunner.dll</WasmMainAssemblyFileName> |
10 | 10 |
|
| 11 | + <InstallWasmtimeForTests Condition="'$(InstallWasmtimeForTests)' == '' and |
| 12 | + ('$(ContinuousIntegrationBuild)' != 'true' or Exists('/.dockerenv'))" |
| 13 | + >true</InstallWasmtimeForTests> |
| 14 | + |
11 | 15 | <!--<InstallWorkloadUsingArtifactsDependsOn>_GetWorkloadsToInstall;$(InstallWorkloadUsingArtifactsDependsOn)</InstallWorkloadUsingArtifactsDependsOn>--> |
12 | 16 | <GetWorkloadInputsDependsOn>_GetWorkloadsToInstall;$(GetWorkloadInputsDependsOn)</GetWorkloadInputsDependsOn> |
13 | 17 | <GetNuGetsToBuildForWorkloadTestingDependsOn>_GetNugetsForAOT;$(GetNuGetsToBuildForWorkloadTestingDependsOn)</GetNuGetsToBuildForWorkloadTestingDependsOn> |
14 | 18 | <WASI_SDK_PATH Condition="'$(WASI_SDK_PATH)' == ''">$([MSBuild]::NormalizeDirectory($(MonoProjectRoot), 'wasi', 'wasi-sdk'))</WASI_SDK_PATH> |
| 19 | + |
| 20 | + <_BundleAOTTestWasmAppForHelixDependsOn>$(_BundleAOTTestWasmAppForHelixDependsOn);PrepareForWasiBuildApp;_PrepareForAOTOnHelix</_BundleAOTTestWasmAppForHelixDependsOn> |
15 | 21 | </PropertyGroup> |
16 | 22 |
|
17 | 23 | <!-- On CI this is installed as part of pretest, but it should still be installed |
|
42 | 48 | <_XHarnessArgs Condition="'$(IsFunctionalTest)' == 'true'" >$(_XHarnessArgs) --expected-exit-code=$(ExpectedExitCode)</_XHarnessArgs> |
43 | 49 | <_XHarnessArgs Condition="'$(WasmXHarnessArgs)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgs)</_XHarnessArgs> |
44 | 50 | <_XHarnessArgs Condition="'$(WasmXHarnessTestsTimeout)' != ''" >$(_XHarnessArgs) "--timeout=$(WasmXHarnessTestsTimeout)"</_XHarnessArgs> |
| 51 | + <_XHarnessArgs >$(_XHarnessArgs) --engine-arg=--max-wasm-stack=134217728</_XHarnessArgs> |
45 | 52 | <_XHarnessArgs Condition="'$(WasmXHarnessArgsCli)' != ''" >$(_XHarnessArgs) $(WasmXHarnessArgsCli)</_XHarnessArgs> |
46 | | - |
| 53 | + |
47 | 54 | <_InvariantGlobalization Condition="'$(InvariantGlobalization)' == 'true'">--env=DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true</_InvariantGlobalization> |
48 | 55 |
|
49 | 56 | <!-- There two flavors of WasmXHarnessArgs and WasmXHarnessMonoArgs, one is MSBuild property and the other is environment variable --> |
|
55 | 62 | <_AOTBuildCommand Condition="'$(BrowserHost)' != 'windows'">_buildAOTFunc publish/ProxyProjectForAOTOnHelix.proj $XHARNESS_OUT/AOTBuild.binlog</_AOTBuildCommand> |
56 | 63 | <_AOTBuildCommand Condition="'$(BrowserHost)' == 'windows'">dotnet msbuild publish/ProxyProjectForAOTOnHelix.proj /bl:%XHARNESS_OUT%/AOTBuild.binlog</_AOTBuildCommand> |
57 | 64 |
|
58 | | - <_AOTBuildCommand Condition="'$(BrowserHost)' == 'windows'">$(_AOTBuildCommand) "/p:WasmCachePath=%USERPROFILE%\.emscripten-cache"</_AOTBuildCommand> |
59 | | - |
60 | 65 | <!-- running aot-helix tests locally, so we can test with the same project file as CI --> |
61 | 66 | <_AOTBuildCommand Condition="'$(ContinuousIntegrationBuild)' != 'true'">$(_AOTBuildCommand) /p:RuntimeSrcDir=$(RepoRoot) /p:RuntimeConfig=$(Configuration) /p:TasksConfiguration=$(TasksConfiguration)</_AOTBuildCommand> |
62 | 67 |
|
|
132 | 137 | </ItemGroup> |
133 | 138 | </Target> |
134 | 139 |
|
| 140 | + <Target Name="_PrepareForAOTOnHelix"> |
| 141 | + <ItemGroup> |
| 142 | + <_WasmPropertyNames Include="DisableParallelEmccCompile" /> |
| 143 | + <_WasmPropertyNames Include="WasiClangCompileOptimizationFlag" /> |
| 144 | + <_WasmPropertyNames Include="WasiClangLinkOptimizationFlag" /> |
| 145 | + <_WasmPropertyNames Include="WasmIncludeFullIcuData" /> |
| 146 | + <_WasmPropertyNames Include="WasmIcuDataFileName" /> |
| 147 | + <_WasmPropertyNames Include="HybridGlobalization" /> |
| 148 | + </ItemGroup> |
| 149 | + </Target> |
| 150 | + |
135 | 151 | <Target Name="_WasiAddToRunScript" BeforeTargets="GenerateRunScript"> |
136 | 152 | <ItemGroup Condition="'$(OS)' != 'Windows_NT'"> |
137 | 153 | <SetScriptCommands Condition="'$(InstallWasmtimeForTests)' == 'true' and Exists($(WasmtimeDir))" Include="export PREPEND_PATH=$(WasmtimeDir)" /> |
| 154 | + <SetScriptCommands Condition="'$(IsWasiProject)' == 'true'" Include="export RuntimeIdentifier=wasi-wasm" /> |
138 | 155 | </ItemGroup> |
139 | 156 | <ItemGroup Condition="'$(OS)' == 'Windows_NT'"> |
140 | 157 | <SetScriptCommands Condition="'$(InstallWasmtimeForTests)' == 'true' and Exists($(WasmtimeDir))" Include="set PREPEND_PATH=$(WasmtimeDir)" /> |
| 158 | + <SetScriptCommands Condition="'$(IsWasiProject)' == 'true'" Include="set RuntimeIdentifier=wasi-wasm" /> |
141 | 159 | </ItemGroup> |
142 | 160 | </Target> |
143 | 161 |
|
|
0 commit comments