diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index e249e8ac922a7f..6fb7c406f1ceaa 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -109,8 +109,12 @@ jobs: displayName: Disk Usage before Build # Build managed test components - - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testTreeFilterArg) ci /p:TargetOS=AnyOS - displayName: Build managed test components + - ${{ if in(parameters.testGroup, 'ilasm') }}: + - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout standalone skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testTreeFilterArg) ci /p:TargetOS=AnyOS + displayName: Build managed test components for ilasm + - ${{ else }}: + - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) $(testTreeFilterArg) ci /p:TargetOS=AnyOS + displayName: Build managed test components - ${{ if in(parameters.osGroup, 'osx', 'ios', 'tvos') }}: - script: | diff --git a/src/tests/build.cmd b/src/tests/build.cmd index eaa552d89a1d07..cf867072895b10 100644 --- a/src/tests/build.cmd +++ b/src/tests/build.cmd @@ -101,6 +101,7 @@ if /i "%arg%" == "SkipManaged" (set __SkipManaged=1&set processedArgs= if /i "%arg%" == "SkipNative" (set __SkipNative=1&set __CopyNativeProjectsAfterCombinedTestBuild=false&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%arg%" == "SkipTestWrappers" (set __SkipTestWrappers=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%arg%" == "SkipGenerateLayout" (set __SkipGenerateLayout=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%arg%" == "Standalone" (set BuildAsStandalone=true&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%arg%" == "CopyNativeOnly" (set __CopyNativeTestBinaries=1&set __SkipNative=1&set __CopyNativeProjectsAfterCombinedTestBuild=false&set __SkipGenerateLayout=1&set __SkipTestWrappers=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%arg%" == "GenerateLayoutOnly" (set __GenerateLayoutOnly=1&set __SkipManaged=1&set __SkipNative=1&set __CopyNativeProjectsAfterCombinedTestBuild=false&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) @@ -382,6 +383,7 @@ echo -SkipManaged: Skip the managed tests build. echo -SkipNative: Skip the native tests build. echo -SkipTestWrappers: Skip generating test wrappers. echo -SkipGenerateLayout: Skip generating the Core_Root layout. +echo -Standalone: Builds the tests as standalone exes. echo. echo -CopyNativeOnly: Only copy the native test binaries to the managed output. Do not build the native or managed tests. echo -GenerateLayoutOnly: Only generate the Core_Root layout without building managed or native test components. diff --git a/src/tests/build.sh b/src/tests/build.sh index f222c69988c788..67af21d9526fe8 100755 --- a/src/tests/build.sh +++ b/src/tests/build.sh @@ -111,6 +111,7 @@ build_Tests() export __ErrMsgPrefix export __Exclude export EnableNativeSanitizers + export BuildAsStandalone # Generate build command buildArgs=("$__RepoRootDir/src/tests/build.proj") @@ -146,6 +147,7 @@ usage_list+=("-skipmanaged - Skip the managed tests build.") usage_list+=("-skipnative - Skip the native tests build.") usage_list+=("-skiptestwrappers - Skip generating test wrappers.") usage_list+=("-skipgeneratelayout - Skip generating the Core_Root layout.") +usage_list+=("-standalone - Builds the tests as standalone exes.") usage_list+=("") usage_list+=("-copynativeonly - Only copy the native test binaries to the managed output. Do not build the native or managed tests.") usage_list+=("-generatelayoutonly - Only generate the Core_Root layout without building managed or native test components.") @@ -281,6 +283,10 @@ handle_arguments_local() { __SkipGenerateLayout=1 ;; + standalone|-standalone) + BuildAsStandalone=true + ;; + excludemonofailures|-excludemonofailures) __Mono=1 ;;