diff options
author | Aaron Robinson <arobins@microsoft.com> | 2018-08-16 11:21:51 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 11:21:51 -0700 |
commit | f0f42d4c0fc3cfd782b89171840e2590604392cd (patch) | |
tree | c89ed0ffe7ba540d952cefd89f267e1912aedecf /build.sh | |
parent | 72e9b8d589f114776e3f42058d721058b77133b9 (diff) | |
download | coreclr-f0f42d4c0fc3cfd782b89171840e2590604392cd.tar.gz coreclr-f0f42d4c0fc3cfd782b89171840e2590604392cd.tar.bz2 coreclr-f0f42d4c0fc3cfd782b89171840e2590604392cd.zip |
Build-test.sh handles native test assets (#19430)
* Respect Windows script argument to skip package building.
* Bring build.sh logic closer to build.cmd with respect to passing CMAKE flags for building tests
* Make cmake gen script find override file without using script arguments
* build-test.sh can now build native test projects
Remove compileoptions.cmake and push contents into configurecompiler.cmake
which contains compiler configuration from repo root CMakeLists.txt
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -306,8 +306,8 @@ build_native() pushd "$intermediatesForBuild" # Regenerate the CMake solution - echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion $__ClangMinorVersion $platformArch $__BuildType $__CodeCoverage $__IncludeTests $generator $extraCmakeArguments $__cmakeargs" - "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion $__ClangMinorVersion $platformArch $__BuildType $__CodeCoverage $__IncludeTests $generator "$extraCmakeArguments" "$__cmakeargs" + echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion $__ClangMinorVersion $platformArch $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs" + "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion $__ClangMinorVersion $platformArch $__BuildType $__CodeCoverage $generator "$extraCmakeArguments" "$__cmakeargs" popd fi @@ -359,7 +359,6 @@ build_cross_arch_component() export __CMakeBinDir="$__CrossComponentBinDir" export CROSSCOMPONENT=1 - __IncludeTests= if [ $CROSSCOMPILE == 1 ]; then TARGET_ROOTFS="$ROOTFS_DIR" @@ -619,7 +618,6 @@ esac __BuildType=Debug __CodeCoverage= -__IncludeTests=Include_Tests __IgnoreWarnings=0 # Set the various build properties here so that CMake and MSBuild can pick them up @@ -644,6 +642,7 @@ __SkipCoreCLR=0 __SkipMSCorLib=0 __SkipRestoreOptData=0 __SkipCrossgen=0 +__SkipTests=0 __CrossBuild=0 __ClangMajorVersion=0 __ClangMinorVersion=0 @@ -837,14 +836,11 @@ while :; do __SkipCrossgen=1 ;; - includetests|-includetests) - ;; - skiptests|-skiptests) - __IncludeTests= + __SkipTests=1 ;; - skipnuget|-skipnuget) + skipnuget|-skipnuget|skipbuildpackages|-skipbuildpackages) __SkipNuget=1 ;; @@ -1009,6 +1005,13 @@ 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 |