Skip to content

Make testing wasm on windows in runtimelab easier by using MSBuild IsOSPlatform not TargetOS #46105

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

Closed
yowl wants to merge 4 commits into from
Closed

Make testing wasm on windows in runtimelab easier by using MSBuild IsOSPlatform not TargetOS #46105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca4976a
make testing wasm on windows by using MSBuild IsOSPlatform not TargetOS
yowl Dec 15, 2020
f6bbba4
bring target OS test in line with test.targets
yowl Dec 18, 2020
a8c5682
bring target OS test in line
yowl Dec 18, 2020
7071bbc
fix up the quotes
yowl Dec 19, 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
16 changes: 8 additions & 8 deletions eng/testing/tests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<Project>
<PropertyGroup>
<RunScriptInputName Condition="'$(TargetOS)' == 'windows'">RunnerTemplate.cmd</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' != 'windows'">RunnerTemplate.sh</RunScriptInputName>
<RunScriptInputName Condition="!('$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">RunnerTemplate.cmd</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">RunnerTemplate.sh</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'">AppleRunnerTemplate.sh</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' == 'Android'">AndroidRunnerTemplate.sh</RunScriptInputName>
<RunScriptInputName Condition="'$(TargetOS)' == 'Browser'">WasmRunnerTemplate.sh</RunScriptInputName>

<RunScriptInputPath>$(MSBuildThisFileDirectory)$(RunScriptInputName)</RunScriptInputPath>

<RunScriptOutputName Condition="'$(TargetOS)' == 'windows'">RunTests.cmd</RunScriptOutputName>
<RunScriptOutputName Condition="'$(TargetOS)' != 'windows'">RunTests.sh</RunScriptOutputName>
<RunScriptOutputName Condition="!('$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">RunTests.cmd</RunScriptOutputName>
<RunScriptOutputName Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">RunTests.sh</RunScriptOutputName>
<RunScriptOutputPath>$([MSBuild]::NormalizePath('$(OutDir)', '$(RunScriptOutputName)'))</RunScriptOutputPath>

<RunScriptHostDir Condition="'$(TargetOS)' == 'windows'">%RUNTIME_PATH%\</RunScriptHostDir>
<RunScriptHostDir Condition="'$(TargetOS)' != 'windows'">$RUNTIME_PATH/</RunScriptHostDir>
<RunScriptHostDir Condition="!('$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">%RUNTIME_PATH%\</RunScriptHostDir>
<RunScriptHostDir Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">$RUNTIME_PATH/</RunScriptHostDir>

<RunScriptHost Condition="'$(TargetOS)' == 'windows'">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
<RunScriptHost Condition="'$(TargetOS)' != 'windows'">$(RunScriptHostDir)dotnet</RunScriptHost>
<RunScriptHost Condition="!('$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT')">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
<RunScriptHost Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@

<!-- Set Test Wrapper running host OS -->
<PropertyGroup>
<TestWrapperTargetsWindows>false</TestWrapperTargetsWindows>
<TestWrapperTargetsWindows Condition=" ('$(TargetsWindows)' != '' And '$(TargetsWindows)' ) OR ('$(TargetOS)' == 'Android' And '$(TargetArchitecture)' == 'arm64' )">true</TestWrapperTargetsWindows>
<TestWrapperTargetsWindows>true</TestWrapperTargetsWindows>
<TestWrapperTargetsWindows Condition="'$(TargetOS)' != 'windows' and '$(OS)' != 'Windows_NT'">false</TestWrapperTargetsWindows>
</PropertyGroup>

</Project>