Skip to content

Commit

Permalink
Remove native test build from build.sh (dotnet#26176)
Browse files Browse the repository at this point in the history
* Remove native test build from build.sh

* Remove skiptests from unix documentation and yml

* Add back skiptests for winodws
  • Loading branch information
Jarret Shook authored Aug 22, 2019
1 parent 2173d92 commit 42e189b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
14 changes: 1 addition & 13 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)."
Expand All @@ -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"
Expand Down Expand Up @@ -641,7 +640,6 @@ __SkipRestoreOptData=0
__SkipCrossgen=0
__CrossgenOnly=0
__PartialNgen=0
__SkipTests=0
__CrossBuild=0
__ClangMajorVersion=0
__ClangMinorVersion=0
Expand Down Expand Up @@ -893,10 +891,6 @@ while :; do
__PartialNgen=1
;;

skiptests|-skiptests)
__SkipTests=1
;;

skipnuget|-skipnuget|skipbuildpackages|-skipbuildpackages)
__SkipNuget=1
;;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/build-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion scripts/superpmi.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/run-pmi-diffs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 42e189b

Please sign in to comment.