modify cli arguments

Author: max-charlamb

eng/build.ps1

@@ -3,12 +3,12 @@ Param(
     [ValidateSet("x86","x64","arm","arm64")][string][Alias('a', "platform")]$architecture = [System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant(),
     [ValidateSet("Debug","Release")][string][Alias('c')] $configuration = "Debug",
     [string][Alias('v')] $verbosity = "minimal",
-    [switch][Alias('wt')] $withtests,
-    [switch][Alias('rt')] $runtests,
+    [switch][Alias('t')] $test,
     [switch] $installruntimes,
     [switch] $privatebuild,
     [switch] $ci,
     [switch][Alias('bl')]$binaryLog,
+    [switch] $skiptest,
     [switch] $skipmanaged,
     [switch] $skipnative,
     [switch] $bundletools,
@@ -24,11 +24,6 @@ Param(
 Set-StrictMode -Version Latest
 $ErrorActionPreference = "Stop"
 
-if ($runtests) {
-    $skipmanaged = $true
-    $skipnative = $true
-}
-
 $crossbuild = $false
 if (($architecture -eq "arm") -or ($architecture -eq "arm64")) {
     $processor = @([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())
@@ -73,7 +68,7 @@ if (-not $skipnative) {
 
 # Install sdk for building, restore and build managed components.
 if (-not $skipmanaged) {
-    if ($withtests) {
+    if (-not $skiptest) {
         $remainingargs = "/p:BuildTests=true " + $remainingargs
     }
 
@@ -103,7 +98,7 @@ if ($installruntimes -or $privatebuild) {
 }
 
 # Run the xunit tests
-if ($runtests) {
+if ($test) {
     if (-not $crossbuild) {
         if ($useCdac) {
             $env:SOS_TEST_CDAC="true"

eng/build.sh

@@ -28,8 +28,8 @@ __SkipConfigure=0
 __SkipGenerateVersion=0
 __InstallRuntimes=0
 __PrivateBuild=0
-__BuildTests=0
-__RunTests=0
+__Test=0
+__TestBuild=1
 __UnprocessedBuildArgs=
 __UseCdac=0
 __LiveRuntimeDir=
@@ -102,14 +102,12 @@ handle_arguments() {
             __PrivateBuild=1
             ;;
 
-        withtests|-withtests)
-            __BuildTests=1
+        test|-test)
+            __Test=1
             ;;
 
-        runtests|-runtests)
-            __RunTests=1
-            __NativeBuild=0
-            __ManagedBuild=0
+        skiptest|-skiptest)
+            __TestBuild=0
             ;;
 
         usecdac|-usecdac)
@@ -227,7 +225,7 @@ if [[ "$__ManagedBuild" == 1 ]]; then
     # __CommonMSBuildArgs contains TargetOS property
     echo "Commencing managed build for $__BuildType in $__RootBinDir/bin"
 
-    if [[ "$__BuildTests" == 1 ]]; then
+    if [[ "$__TestBuild" == 1 ]]; then
         __ManagedBuildArgs="$__ManagedBuildArgs /p:BuildTests=true"
     fi
 
@@ -270,7 +268,7 @@ fi
 # Run xunit tests
 #
 
-if [[ "$__RunTests" == 1 ]]; then
+if [[ "$__Test" == 1 ]]; then
    if [[ "$__CrossBuild" == 0 ]]; then
       if [[ -z "$LLDB_PATH" ]]; then
         check_version_exists() {

eng/pipelines/build.yml

@@ -130,8 +130,7 @@ jobs:
       - _PhaseName: ${{ coalesce(parameters.name, parameters.osGroup) }}_${{ config.architecture }}_${{ config.configuration }}
       - _Pipeline_StreamDumpDir: $(Build.SourcesDirectory)/artifacts/tmp/${{ config.configuration }}/streams
 
-      - _BuildTestArgs: '-withtests'
-      - _RunTestArgs: '-runtests'
+      - _TestArgs: '-test'
       - _Cross: ''
 
       - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
@@ -143,10 +142,10 @@ jobs:
         'error, testOnly and buildOnly cannot be true at the same time': error
 
       - ${{ if eq(parameters.testOnly, 'true') }}:
-        - _BuildTestArgs: '-withtests -skipnative'
+        - _BuildTestArgs: '-skipnative'
 
       - ${{ if or(eq(parameters.buildOnly, 'true'), eq(parameters.isCodeQLRun, 'true')) }}:
-        - _BuildTestArgs: ''
+        - _BuildTestArgs: '-skiptest'
 
       # For testing msrc's and service releases. The RuntimeSourceVersion is either "default" or the service release version to test
       - _InternalInstallArgs: ''

test.sh

@@ -13,5 +13,4 @@ while [[ -h $source ]]; do
 done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
-"$scriptroot/eng/build.sh" -runtests $@
-
+"$scriptroot/eng/build.sh" -test -skipmanaged -skipnative $@