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 /src/pal/tools | |
| 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 'src/pal/tools')
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index b5726c82e3..32a217f301 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -53,10 +53,6 @@ for i in "${@:5}"; do echo "Code coverage is turned on for this build." code_coverage=ON ;; - INCLUDE_TESTS) - echo "Including tests directory in build." - build_tests=ON - ;; NINJA) generator=Ninja ;; @@ -166,9 +162,12 @@ else overridefile=clang-compiler-override.txt fi +# Determine the current script directory +__currentScriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + cmake \ -G "$generator" \ - "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$1/src/pal/tools/$overridefile" \ + "-DCMAKE_USER_MAKE_RULES_OVERRIDE=${__currentScriptDir}/$overridefile" \ "-DCMAKE_AR=$llvm_ar" \ "-DCMAKE_LINKER=$llvm_link" \ "-DCMAKE_NM=$llvm_nm" \ @@ -176,7 +175,6 @@ cmake \ "-DCMAKE_BUILD_TYPE=$buildtype" \ "-DCMAKE_EXPORT_COMPILE_COMMANDS=1 " \ "-DCLR_CMAKE_ENABLE_CODE_COVERAGE=$code_coverage" \ - "-DCLR_CMAKE_BUILD_TESTS=$build_tests" \ $cmake_extra_defines \ $__UnprocessedCMakeArgs \ "$1" |