Remove native test build from build.sh (dotnet/coreclr#26176)

* Remove native test build from build.sh

* Remove skiptests from unix documentation and yml

* Add back skiptests for winodws

Commit migrated from https://github.com/dotnet/coreclr/commit/42e189be4fd1fbb68a13345074d726b4cf86d195

diff --git a/eng/build-job.yml b/eng/build-job.yml
index 94feaa31c4efc5969abc1c301c6fd1fd0853f3f7..2a952d247cde7689b4423c19915b7771a813c1f2 100644 (file)
--- a/eng/build-job.yml
+++ b/eng/build-job.yml
@@ -118,7 +118,7 @@ jobs:
 
     # Build
     - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-      - script: ./build.sh $(buildConfig) $(archType) $(crossArg) -ci -skiptests -skipnuget $(clangArg) $(stripSymbolsArg) $(officialBuildIdArg)
+      - script: ./build.sh $(buildConfig) $(archType) $(crossArg) -ci -skipnuget $(clangArg) $(stripSymbolsArg) $(officialBuildIdArg)
         displayName: Build product
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
       - script: set __TestIntermediateDir=int&&build.cmd $(buildConfig) $(archType) -ci -skiptests -skipbuildpackages $(officialBuildIdArg) $(ibcOptimizeArg) $(enforcePgoArg)

diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh
index 43b27b8f41feeca9798e599a229b8bb4bd445412..6358e097237ce170251dd13da9ded5772137b1b0 100755 (executable)
--- a/src/coreclr/build.sh
+++ b/src/coreclr/build.sh
@@ -25,7 +25,7 @@ export PYTHON
 
 usage()
 {
-    echo "Usage: $0 [BuildArch] [BuildType] [-verbose] [-coverage] [-cross] [-gccx.y] [-clangx.y] [-ninja] [-configureonly] [-skipconfigure] [-skipnative] [-skipcrossarchnative] [-skipmanaged] [-skipmscorlib] [-skiptests] [-stripsymbols] [-ignorewarnings] [-cmakeargs] [-bindir]"
+    echo "Usage: $0 [BuildArch] [BuildType] [-verbose] [-coverage] [-cross] [-gccx.y] [-clangx.y] [-ninja] [-configureonly] [-skipconfigure] [-skipnative] [-skipcrossarchnative] [-skipmanaged] [-skipmscorlib] [-stripsymbols] [-ignorewarnings] [-cmakeargs] [-bindir]"
     echo "BuildArch can be: -x64, -x86, -arm, -armel, -arm64"
     echo "BuildType can be: -debug, -checked, -release"
     echo "-coverage - optional argument to enable code coverage build (currently supported only for Linux and OSX)."
@@ -43,7 +43,6 @@ usage()
     echo "-skipcrossarchnative - do not build cross-architecture native components."
     echo "-skipmanaged - do not build managed components."
     echo "-skipmscorlib - do not build mscorlib.dll."
-    echo "-skiptests - skip the tests in the 'tests' subdirectory."
     echo "-skipnuget - skip building nuget packages."
     echo "-skiprestoreoptdata - skip restoring optimization data used by profile-based optimizations."
     echo "-skipcrossgen - skip native image generation"
@@ -641,7 +640,6 @@ __SkipRestoreOptData=0
 __SkipCrossgen=0
 __CrossgenOnly=0
 __PartialNgen=0
-__SkipTests=0
 __CrossBuild=0
 __ClangMajorVersion=0
 __ClangMinorVersion=0
@@ -893,10 +891,6 @@ while :; do
             __PartialNgen=1
             ;;
 
-        skiptests|-skiptests)
-            __SkipTests=1
-            ;;
-
         skipnuget|-skipnuget|skipbuildpackages|-skipbuildpackages)
             __SkipNuget=1
             ;;
@@ -1072,12 +1066,6 @@ generate_event_logging
 # Build the coreclr (native) components.
 __ExtraCmakeArgs="-DCLR_CMAKE_TARGET_OS=$__BuildOS -DCLR_CMAKE_PACKAGES_DIR=$__PackagesDir -DCLR_CMAKE_PGO_INSTRUMENT=$__PgoInstrument -DCLR_CMAKE_OPTDATA_VERSION=$__PgoOptDataVersion -DCLR_CMAKE_PGO_OPTIMIZE=$__PgoOptimize"
 
-# [TODO] Remove this when the `build-test.sh` script properly builds and deploys test assets.
-if [ $__SkipTests != 1 ]; then
-    echo "Adding CMake flags to build native tests for $__BuildOS.$__BuildArch.$__BuildType"
-    __ExtraCmakeArgs="$__ExtraCmakeArgs -DCLR_CMAKE_BUILD_TESTS=ON"
-fi
-
 build_native $__SkipCoreCLR "$__BuildArch" "$__IntermediatesDir" "$__ExtraCmakeArgs" "CoreCLR component"
 
 # Build cross-architecture components

diff --git a/src/coreclr/scripts/superpmi.md b/src/coreclr/scripts/superpmi.md
index 4763b023a530f266ff802c860a83cc8195830af5..074ed494d3d68b8dad76ddda110dba85b6b61a8c 100644 (file)
--- a/src/coreclr/scripts/superpmi.md
+++ b/src/coreclr/scripts/superpmi.md
@@ -30,7 +30,7 @@ Although SuperPMI has many uses, setup and use of SuperPMI is not always trivial
 
 See the table above for locations of default collections that exist. If there is an mch file that exists, then SuperPMI will automatically download and setup the mch using that location. Please note that, it is possible that the collection is out of date, or there is a jitinterface change which makes the collection invalid. If this is the case, then in order to use the tool a collection will have to be done manually. In order to reproduce the default collections, please see below for what command the default collections are done with.
 
-`/Users/jashoo/coreclr/build.sh x64 checked -skiptests`
+`/Users/jashoo/coreclr/build.sh x64 checked`
 
 `/Users/jashoo/coreclr/build-test.sh x64 checked -priority1`
 

diff --git a/src/coreclr/tests/scripts/run-pmi-diffs.py b/src/coreclr/tests/scripts/run-pmi-diffs.py
index e02f409dc3ba317ce65fc695073bc99c57cd3f6f..37de4d8251072cdf09cffde47284fa8df6bd8f20 100755 (executable)
--- a/src/coreclr/tests/scripts/run-pmi-diffs.py
+++ b/src/coreclr/tests/scripts/run-pmi-diffs.py
@@ -333,7 +333,7 @@ def baseline_build():
         if Is_windows:
             command = 'set __TestIntermediateDir=int&&build.cmd %s checked skiptests skipbuildpackages' % arch
         else:
-            command = '%s%s/build.sh %s checked skiptests skipbuildpackages %s' % (dockerCmd, scriptPath, arch, buildOpts)
+            command = '%s%s/build.sh %s checked skipbuildpackages %s' % (dockerCmd, scriptPath, arch, buildOpts)
         log(command)
         returncode = 0 if testing else os.system(command)
         if returncode != 0: