Skip to content
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.

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

Webassembly Runtime Tests #38556

Merged
merged 196 commits into from
Aug 26, 2020
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
79d9400
Skeleton of wasm test system.
jkotas Jul 9, 2020
417a08a
Merge branch 'master' of github.com:dotnet/runtime into naricc/webass…
Jul 13, 2020
baf9942
Changes to wasm app builder.
Jul 15, 2020
308a408
Integrating into build system more.
Jul 20, 2020
cbba910
Integrated into build system.
Jul 22, 2020
1dc2a74
Moved wasm utilities to test/eng.
Jul 22, 2020
da9b5ca
Moved wasm test runner, driver into /src/mono/wasm
Jul 22, 2020
1cf76af
Merge branch 'master' of github.com:dotnet/runtime into naricc/webass…
Jul 22, 2020
5410254
Changes to build outputs.
Aug 4, 2020
b3c92a1
Changes to wasm test runner project.
Aug 5, 2020
4a3bdbd
Changed arguments to main, added wasm arch to test runs.
Aug 6, 2020
3d6e5c4
Skip assemblies with no main.
Aug 6, 2020
610a5a5
Fix the way to invoke build for WasmTestDriver and WasmTestRunner pro…
fanyang-mono Aug 7, 2020
6978a17
Make directory portable
fanyang-mono Aug 7, 2020
242717e
Added wasm issues to issues.targets.
Aug 8, 2020
7dc15c7
Changed wasm test runner to take a single dll.
Aug 8, 2020
28d638a
Exclude unsupported test
fanyang-mono Aug 8, 2020
ff11d83
Changed CLRTest.Execute.Bash.Targets to build wasm app on helix.
Aug 9, 2020
591a1be
Merged changes from master.
Aug 9, 2020
1ab40f4
Removed check for native tests inwrapper generation.
Aug 10, 2020
fdc92f3
Initial changes to use dotnet instead of corerun.
Aug 11, 2020
b9efb3d
Small changes
Aug 12, 2020
a18b89f
Merge pull request #2 from jashook/small_change
Aug 12, 2020
cc6e89e
Use DotnetRoot property in bash script for wasm.
Aug 12, 2020
246a42e
Use os=browser in runtest.sh when arch=wasm. Filter out run-v8.sh fro…
Aug 13, 2020
eb2b7c8
Merged changes from master.
Aug 13, 2020
7be5ba9
Removed no longer needed wasm-test-driver.
Aug 13, 2020
eea8cf9
Added Browser_wasm build of mono.
Aug 13, 2020
816ffb4
Browser_wasm library configuration.
Aug 13, 2020
c672b0a
Fix syntax error in runtime.yml
Aug 13, 2020
bca8d6c
Fix syntax error in runtime.yml
Aug 13, 2020
7112948
Change to runtest.sh to propagate browser.
Aug 13, 2020
3cf017a
Wasm test run.
Aug 14, 2020
d2e1e14
Update to runtime.yml
Aug 14, 2020
62e1c92
Removed extra 'yml'
Aug 14, 2020
0202e9d
Made path absolute.
Aug 14, 2020
fac109d
Got rid of extra parameters.
Aug 14, 2020
69f7a48
Changed white space.
Aug 14, 2020
719ff26
Fixed send to helix template.
Aug 14, 2020
7275716
Got rid of variables.
Aug 14, 2020
2863dd4
Added missing -
Aug 14, 2020
65423ac
Removed loggin task.
Aug 14, 2020
33a3176
Changes suffix.
Aug 14, 2020
1a1f539
Changed to absolute path for coreclr test build.
Aug 14, 2020
2136ae1
Removed extra libraries build of wasm.
Aug 14, 2020
760a324
Removed property group
Aug 14, 2020
c8e3218
Removed proprety group for helixpublishwitharcade.
Aug 14, 2020
cef0d12
Added dotnet cli to helix project.
Aug 14, 2020
dbbcc28
Added Build.SourcesDirectory to build-tests path.
Aug 14, 2020
6331e5b
Disambiguated names.
Aug 14, 2020
3e0bc13
Copy all the wasm stuff to CoreRoot to support helix.
Aug 14, 2020
16fd82c
Added helix queues for wasm-browser; temporarily remvoed other builds…
Aug 14, 2020
c57c1d4
../../eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-t…
Aug 14, 2020
3efa2d6
Changed build config to upper.
Aug 14, 2020
097864c
Fixed path to helixpublishwitharcade.
Aug 15, 2020
0babb9b
Defined _HelixSource
Aug 15, 2020
7ecf681
Added missing _
Aug 15, 2020
b848c4d
Added values for timeouts.
Aug 15, 2020
b9cbe36
Removed unneeded variables.
Aug 15, 2020
affacab
Fixed missing condition.
Aug 15, 2020
02ffa55
Removed unneeded conditions.
Aug 15, 2020
a557c9f
Debuggin in helixpublishwitharcade.
Aug 15, 2020
45b50de
wasm-->Browser
Aug 15, 2020
13a9ca1
Fixed quote.
Aug 15, 2020
0989632
Added more logging.
Aug 15, 2020
e17e726
Try specifying targetOS in send-to-helix-step.
Aug 15, 2020
adca201
Try specifying version of dotnetcli
Aug 15, 2020
416a862
Changed mono config to debug.
Aug 15, 2020
ee87000
Propaged build config to test build.
Aug 15, 2020
24c16b4
Minor path fixes in wasm-related scripts
trylek Aug 15, 2020
00af3f1
Disabled some tests that will not build on wasm.
Aug 16, 2020
c56e905
Limited to one test.
Aug 16, 2020
da76630
Added mising *.
Aug 16, 2020
fb1fcf6
Change WasmTestRunner to not have its own assembly.
Aug 16, 2020
bb603ed
Fixed syntax error.
Aug 16, 2020
ca81d13
Added missing space.
Aug 16, 2020
ddff3a3
Hack around HelixRuntimeRid vs. DotNetCliRuntime
trylek Aug 16, 2020
0293e08
Fixed build timeout.
Aug 16, 2020
c97651f
Fixed indentation, case.
Aug 16, 2020
c21d9c9
Updated bash script to use .
Aug 16, 2020
09df995
Added wasmappbuilder console.
Aug 17, 2020
1d97977
Made a console version of WasmAppBuilder.
Aug 17, 2020
fedb93f
Added publication of WasmAppBuilderConsole to test project.
Aug 17, 2020
4658d6d
Added restore to runtest.
Aug 17, 2020
30169b7
Fix path to test dll in Helix
trylek Aug 17, 2020
9396040
Remove dirs.proj instrumentation limiting the run to a single test
trylek Aug 17, 2020
e547d90
Limit tests to JIT/Methodical; remove noisy CLRTestKind logging
trylek Aug 17, 2020
12c6401
Added another test exclusion.
Aug 17, 2020
4367353
Removed debugging prints, unneeded whitespace changes.
Aug 17, 2020
b13ac5e
Fixed spelling error in comment.
Aug 17, 2020
5691493
Refactored wasm copy dependencies into a seperate ItemGroup.
Aug 17, 2020
e7488fc
Fixed syntax error in issues.targets.
Aug 17, 2020
53bc489
Fixed copy error.
Aug 17, 2020
c5a8462
Removed text in issues.targets.
Aug 17, 2020
093afd5
Removed intaller build/depedency.
Aug 17, 2020
6b50d5f
Fixed issue in issues.targets.
Aug 17, 2020
e126397
Reversed whitespace changes.
Aug 17, 2020
e110024
Reversed more whitespace changes, extra logging.
Aug 17, 2020
2670c1d
Fixed typo.
Aug 17, 2020
eb2dbe7
Fixed spacing, typos, binlog name.
Aug 17, 2020
14b193e
Reused buildConfigUpper variable.
Aug 17, 2020
1084a5a
Made helixpublishwitharcade.proj use __TargetOS
Aug 17, 2020
de04ba5
removed temporary instrumentation.
Aug 17, 2020
f566dd7
Fixed copywrite header.
Aug 17, 2020
4c4d5ce
Excluded JitBench test from build.
Aug 17, 2020
a5ad041
REmoved redundant DotNetCliRuntime setting.
Aug 17, 2020
b4855df
Added back missing /
Aug 17, 2020
51a0e06
Added ci flag, explicitly set TargetOS in send to helix step.
Aug 17, 2020
c7696c6
Added missing __ in sendtohelixwitharcade.proj; removed explicit targ…
Aug 17, 2020
8ae6954
Fixed names of paramters.
Aug 17, 2020
37d3aa6
Added back explicit targetOS setting.
Aug 18, 2020
f7df341
Merged from master.
Aug 18, 2020
a8aa04d
Got rid of erroneous }}
Aug 18, 2020
b2a80e3
Added failing tests to issues.targets. Send config, arch explicitl in…
Aug 18, 2020
c7ced6a
Added missing )
Aug 18, 2020
f8a62a6
Added missing $
Aug 18, 2020
bd4ccba
Try not setting arch, config.
Aug 18, 2020
e552742
Added missing h.
Aug 18, 2020
c07189d
Changed back to using WasmAppBuilder.
Aug 18, 2020
d349580
Changed back to using app builder task.
Aug 18, 2020
9a4f0cf
Removed bad wild card from issues.targets.
Aug 18, 2020
37b8623
Changed other runtime to sdk.
Aug 19, 2020
ee3e28d
Changed DotnetRuntimeCli
Aug 19, 2020
9fcd362
Propagate skd version.
Aug 19, 2020
099d4a8
Trying different parameters in helixpublishwithcarde.
Aug 19, 2020
3e8289d
Fixed end tag for dotnet cli.
Aug 19, 2020
2c4b8d2
src/coreclr/tests/helixpublishwitharcade.proj
Aug 19, 2020
8ea7b5e
Hard coded version number.
Aug 19, 2020
9e34472
Helix publish with arcade version # changes.
Aug 19, 2020
7736dfa
Explicitly s et netcoreappcurrent.
Aug 19, 2020
46dd26e
Changed computation of test bin path so it will work on helix.
Aug 19, 2020
0577b72
Added TestBinDir to assembly search paths.
Aug 19, 2020
3d9811e
Change dotnetcli variables in helixpublishwitharcade.
Aug 19, 2020
0653317
Added some more failing tests.
Aug 19, 2020
773ce37
Added another failure to issues.targets.
Aug 19, 2020
8b9d3b2
Renabled other runtime lanes.
Aug 20, 2020
ca6de19
Automatically skip wrappers when building native tests.
Aug 20, 2020
ca7336d
Explicitly set GenerateRunScript false when copying native test.
Aug 20, 2020
a2e19e3
Remove GenerateRunScript parameter from build native.
Aug 20, 2020
b1758b1
Changed parameters to try to get it to not build wrapper when copying…
Aug 20, 2020
281e78d
Changed parameters to try to get it to not build wrapper when copying…
Aug 20, 2020
bfeef75
Fixed propagation of CopyNativeTestBinariesOnly
Aug 20, 2020
e258b7f
REversed change to skipnative; it will now also skip the wrapper gene…
Aug 20, 2020
0a81cd9
Break test build into two parts; building tests, generating wrappers.
Aug 20, 2020
43d48ef
Added skipwrappers to first invocation of build-test.sh
Aug 20, 2020
a96bbb4
Changes so we do not have to skipnative on wasm.
Aug 21, 2020
df3c70e
Changes to wasm-runtime-and-send-to-helix.
Aug 21, 2020
76595dd
REmoved uneeded white space change, uncommented build_native.
Aug 21, 2020
694de3d
Fixed condtion on wasm check for building native.
Aug 21, 2020
a9da585
Removed debug printing.
Aug 21, 2020
07bb73e
Merge branch 'master' into naricc/webassembly-ci
Aug 21, 2020
b6b7c7f
Merge branch 'naricc/webassembly-ci' of github.com:naricc/runtime int…
Aug 21, 2020
8a24d9d
Reenable full test suite.
Aug 21, 2020
b099798
Undid white space changes.
Aug 21, 2020
97d4a30
More white space removal.
Aug 21, 2020
ab926d0
Reversing more whitespace changes.
Aug 21, 2020
42f6fd2
Removed debug prints, white space changes.
Aug 21, 2020
a591007
Undoing more white space changes.
Aug 21, 2020
40b5698
Factored DotnetCli options into seperate propert group for wasm.
Aug 21, 2020
1a98a02
Added missing quote.
Aug 21, 2020
b6d0253
Removed unneeeded whitespace change.
Aug 21, 2020
4a1d459
Added issues to issues.targets for tests that need locks.
Aug 22, 2020
3036600
Removed white space, removed extra debug binlog generaiton.
Aug 22, 2020
9c32214
Removed redundant conditional.
Aug 22, 2020
e79db95
Removed uneeded white space. MAde helixpublishwitharcade.proj consist…
Aug 22, 2020
8d9d683
Removed internal build check.
Aug 22, 2020
d6933ac
Removed comment from runtime.
Aug 22, 2020
0aa9abd
Removed debuggin print.
Aug 23, 2020
69c5f41
Switched to release builds.
Aug 23, 2020
5ef901f
Used notargets in WasmTestRunner.proj
Aug 23, 2020
b3ca052
Added TargetFrameowkr back.
Aug 23, 2020
d93c146
Conditionally skip missing assembleis in WasmAppBuilder.
Aug 23, 2020
7bc4432
Set SkipMissingAssemblies to true.
Aug 23, 2020
c45ba5e
Merge branch 'master' of github.com:dotnet/runtime into naricc/webass…
Aug 23, 2020
fd89b64
Added buildConfig to build-test.sh call in wasm-runtime-and-send-to-h…
Aug 24, 2020
0522285
tests/helixpublishwitharcade.proj
Aug 24, 2020
ed8e5e2
Moved wasm-test-runner to /src/tets/Common
Aug 24, 2020
5e318e6
Changed paths to use stuff from liveBuild.targets
Aug 24, 2020
13d1aed
Changed back to hard coded pack for runtime pack.
Aug 24, 2020
1153124
Added missing paren.
Aug 24, 2020
9283ec0
Added precommand to restore packages.
Aug 24, 2020
e8ff962
Use API to get runtime pack.
Aug 24, 2020
fabca40
Changed assembly search paths.
Aug 24, 2020
6261e27
Go back to using runtime pack path directly.
Aug 24, 2020
239c75e
Use RuntimeFiles to get runtime pack stuff.
Aug 24, 2020
436918f
Added ResolveRuntimeFilesFromLocalBuild
Aug 24, 2020
3f01d12
Also copies the libraries from runtime pack.
Aug 24, 2020
40c3de6
Copied both libraries and runtime parts of runtime pack to runtime/na…
Aug 24, 2020
fb02e4b
Added package reference to WasmTestRunner.
Aug 24, 2020
6bed9e0
Added version number to wasm test runner notarget sdk.
Aug 24, 2020
5e362a5
Got rid of package reference.
Aug 24, 2020
1dbce92
Always look for debug version of WasmAppBuilder.
Aug 24, 2020
bce0c4b
Removed unneeded helix precommand.
Aug 24, 2020
48a52a1
Added comment explaining explicit version number.
Aug 24, 2020
d37400d
Increased time out.
Aug 25, 2020
9ae3640
Merge branch 'master' of github.com:dotnet/runtime into naricc/webass…
Aug 25, 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
parameters:
buildConfig: ''
archType: 'wasm'
osGroup: 'Browser'
osSubgroup: ''
container: ''
testGroup: ''
crossrootfsDir: ''
readyToRun: false
liveLibrariesBuildConfig: ''
crossgen2: false
compositeBuildMode: false
helixQueues: ''
stagedBuild: false
displayNameArgs: ''
runInUnloadableContext: false
runtimeVariant: ''
variables: {}
pool: ''
runtimeFlavor: 'mono'
runtimeFlavorDisplayName: 'Mono'
dependsOn: []
#arcade-specific parameters
condition: ''
continueOnError: false
displayName: ''
timeoutInMinutes: ''
enableMicrobuild: ''
gatherAssetManifests: false

steps:
- script: $(Build.SourcesDirectory)/src/coreclr/build-test$(scriptExt) -skipnative -skipstressdependencies -excludemonofailures os Browser wasm
displayName: Build Tests

# Send tests to Helix
- template: /eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
parameters:
displayName: Send tests to Helix
buildConfig: $(buildConfigUpper)
archType: ${{ parameters.archType }}
osGroup: ${{ parameters.osGroup }}
osSubgroup: ${{ parameters.osSubgroup}}
coreClrRepoRoot: $(coreClrRepoRoot)
runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}

${{ if eq(variables['System.TeamProject'], 'public') }}:
naricc marked this conversation as resolved.
Show resolved Hide resolved
creator: $(Build.DefinitionName)

helixBuild: $(Build.BuildNumber)
helixSource: $(_HelixSource)

# REVIEW: not sure why "cli" is part of the names here. Leave it for the ones that already had it,
# but don't add it to new ones.
${{ if eq(parameters.readyToRun, true) }}:
helixType: 'test/functional/r2r/cli/'
${{ if ne(parameters.readyToRun, true) }}:
helixType: 'test/functional/cli/'

helixQueues: ${{ parameters.helixQueues }}

# This tests whether an array is empty
${{ if eq(join('', parameters.helixQueues), '') }}:
condition: false

publishTestResults: true

timeoutPerTestInMinutes: $(timeoutPerTestInMinutes)
timeoutPerTestCollectionInMinutes: $(timeoutPerTestCollectionInMinutes)

runCrossGen: ${{ and(eq(parameters.readyToRun, true), ne(parameters.crossgen2, true)) }}
runCrossGen2: ${{ and(eq(parameters.readyToRun, true), eq(parameters.crossgen2, true)) }}
compositeBuildMode: ${{ parameters.compositeBuildMode }}
runInUnloadableContext: ${{ parameters.runInUnloadableContext }}

${{ if eq(variables['System.TeamProject'], 'internal') }}:
# Access token variable for internal project from the
# DotNet-HelixApi-Access variable group
helixAccessToken: $(HelixApiAccessToken)

helixProjectArguments: '$(coreClrRepoRoot)/tests/helixpublishwitharcade.proj'

scenarios: normal
42 changes: 41 additions & 1 deletion eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ jobs:
eq(variables['isFullMatrix'], true))

#
# Build the whole product using Mono and run tests
# Build the whole product using Mono and run libraries tests
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
Expand Down Expand Up @@ -340,6 +340,46 @@ jobs:
eq(variables['monoContainsChange'], true),
eq(variables['isFullMatrix'], true))

#
# Build the whole product using Mono and run runtime tests
#
- template: /eng/pipelines/common/platform-matrix.yml
parameters:
jobTemplate: /eng/pipelines/common/global-build-job.yml
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
buildConfig: Release
runtimeFlavor: mono
platforms:
- Browser_wasm
variables:
# map dependencies variables to local variables
naricc marked this conversation as resolved.
Show resolved Hide resolved
- name: runtimeTestsContainsChange
value: $[ dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'] ]
- name: monoContainsChange
value: $[ dependencies.checkout.outputs['SetPathVars_mono.containsChange'] ]
jobParameters:
testGroup: innerloop
nameSuffix: AllSubsets_Mono_RuntimeTests
buildArgs: -s mono+libs+installer -c $(_BuildConfig) /p:ArchiveTests=true
naricc marked this conversation as resolved.
Show resolved Hide resolved
timeoutInMinutes: 120
condition: >-
or(
eq(dependencies.checkout.outputs['SetPathVars_runtimetests.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true),
naricc marked this conversation as resolved.
Show resolved Hide resolved
eq(variables['isFullMatrix'], true))
# extra steps, run tests
extraStepsTemplate: /eng/pipelines/common/templates/runtimes/wasm-runtime-and-send-to-helix.yml
extraStepsParameters:
creator: dotnet-bot
testRunNamePrefixSuffix: Mono_$(_BuildConfig)
condition: >-
or(
eq(variables['runtimetestsContainsChange'], true),
eq(variables['monoContainsChange'], true),
eq(variables['isFullMatrix'], true))


#
# Build Mono and Installer on LLVMJIT mode
#
Expand Down
3 changes: 3 additions & 0 deletions src/coreclr/build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ build_test_wrappers()
__Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity"

nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch /p:RuntimeFlavor=$__RuntimeFlavor \"/bl:${__RepoRootDir}/artifacts/log/${__BuildType}/build_test_wrappers_${__RuntimeFlavor}.binlog\" ${__UnprocessedBuildArgs[@]}"

echo "!!! next command: ${nextComand}"
eval $nextCommand

local exitCode="$?"
Expand Down Expand Up @@ -474,6 +476,7 @@ build_MSBuild_projects()
buildArgs+=("${__UnprocessedBuildArgs[@]}")
buildArgs+=("\"/p:CopyNativeProjectBinaries=${__CopyNativeProjectsAfterCombinedTestBuild}\"");
buildArgs+=("/p:__SkipPackageRestore=true");
buildArgs+=("/bl:testlog.binlog")

# Disable warnAsError - coreclr issue 19922
nextCommand="\"$__RepoRootDir/eng/common/msbuild.sh\" $__ArcadeScriptArgs --warnAsError false ${buildArgs[@]}"
Expand Down
9 changes: 7 additions & 2 deletions src/coreclr/scripts/coreclr_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ def __init__(self,
self.require_built_core_root = require_built_core_root
self.require_built_test_dir = require_built_test_dir

self.valid_arches = ["x64", "x86", "arm", "arm64"]
self.valid_arches = ["x64", "x86", "arm", "arm64", "wasm"]
self.valid_build_types = ["Debug", "Checked", "Release"]
self.valid_host_os = ["Windows_NT", "OSX", "Linux", "illumos", "Solaris"]
self.valid_host_os = ["Windows_NT", "OSX", "Linux", "illumos", "Solaris", "Browser"]

self.__initialize__(args)

Expand Down Expand Up @@ -226,12 +226,17 @@ def check_and_return_test_location(test_location):
return test_location

def check_and_return_default_core_root(core_root):
print("!!! check_and_return_default_core_root: Test Location: " + self.test_location)

if core_root is not None:
# core_root was specified on the command-line, so use that one. But verify it.
return os.path.isdir(core_root) or not self.require_built_core_root

# No core_root specified; use a default location if possible.

default_core_root = os.path.join(self.test_location, "Tests", "Core_Root")

print("!!! Default core root: " + default_core_root )
if os.path.isdir(default_core_root) or not self.require_built_core_root:
return default_core_root

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/dir.traversal.targets
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Properties="Dummy=%(Identity);DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true"
ContinueOnError="ErrorAndContinue" />

<MSBuild Targets="$(DefaultBuildAllTarget)"
<MSBuild Targets="$(ç)"
naricc marked this conversation as resolved.
Show resolved Hide resolved
Projects="@(Project)"
Condition="'$(SerializeProjects)'!='true'"
Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true"
Expand Down
6 changes: 6 additions & 0 deletions src/coreclr/tests/helixpublishwitharcade.proj
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
BundledNETCoreAppPackageVersion=$(BundledNETCoreAppPackageVersion);
HelixRuntimeRid=$(HelixRuntimeRid)
</_PropertiesToPass>

<_PropertiesToPass Condition="'$(TargetArchitecture)' == 'wasm' ">
naricc marked this conversation as resolved.
Show resolved Hide resolved
$(PropertiesToPass);IncludeDotNetCli=true
</_PropertiesToPass>
</PropertyGroup>

<Message Text="DotNetCliVersion: $(DotNetCliVersion)" Importance="High" />
Expand Down Expand Up @@ -284,6 +288,8 @@
</Payloads>

<HelixWorkItem Include="@(Payloads->Metadata('PayloadGroup'))">


<PayloadDirectory>%(PayloadDirectory)</PayloadDirectory>
<Command>dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs)</Command>
<Command Condition=" '%(TestGroup)' != '' ">dotnet $(XUnitRunnerDll) %(XUnitWrapperDlls) $(XUnitRunnerArgs) -trait TestGroup=%(TestGroup)</Command>
Expand Down
Loading