summaryrefslogtreecommitdiff
path: root/build-test.sh
diff options
context:
space:
mode:
authorJacek Blaszczynski <biosciencenow@outlook.com>2018-03-26 08:51:00 (GMT)
committerJan Vorlicek <janvorli@microsoft.com>2018-03-26 08:51:00 (GMT)
commitdac3fa6570bcbc6261cec339092cafb0a09a5ca3 (patch)
tree91a25c67566170d136e8139ab3c0001c9ba68993 /build-test.sh
parent1aaace7e617d40d92e6f97cf8ed2b211c34151be (diff)
downloadcoreclr-dac3fa6570bcbc6261cec339092cafb0a09a5ca3.zip
coreclr-dac3fa6570bcbc6261cec339092cafb0a09a5ca3.tar.gz
coreclr-dac3fa6570bcbc6261cec339092cafb0a09a5ca3.tar.bz2
build-test.sh: support Clang v4.0 to v6.0, fix always false logic condition preventing tests build (#17025)
Diffstat (limited to 'build-test.sh')
-rwxr-xr-xbuild-test.sh33
1 files changed, 24 insertions, 9 deletions
diff --git a/build-test.sh b/build-test.sh
index 2ccc3b6..7cb4c02 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -338,7 +338,7 @@ usage()
echo "BuildType can be: debug, checked, release"
echo "coverage - optional argument to enable code coverage build (currently supported only for Linux and OSX)."
echo "ninja - target ninja instead of GNU make"
- echo "clangx.y - optional argument to build using clang version x.y."
+ echo "clangx.y - optional argument to build using clang version x.y - supported version 3.5 - 6.0"
echo "cross - optional argument to signify cross compilation,"
echo " - will use ROOTFS_DIR environment variable if set."
echo "crosscomponent - optional argument to build cross-architecture component,"
@@ -543,31 +543,46 @@ while :; do
__VerboseBuild=1
;;
- clang3.5)
+ clang3.5|-clang3.5)
__ClangMajorVersion=3
__ClangMinorVersion=5
;;
- clang3.6)
+ clang3.6|-clang3.6)
__ClangMajorVersion=3
__ClangMinorVersion=6
;;
- clang3.7)
+ clang3.7|-clang3.7)
__ClangMajorVersion=3
__ClangMinorVersion=7
;;
- clang3.8)
+ clang3.8|-clang3.8)
__ClangMajorVersion=3
__ClangMinorVersion=8
;;
- clang3.9)
+ clang3.9|-clang3.9)
__ClangMajorVersion=3
__ClangMinorVersion=9
;;
+ clang4.0|-clang4.0)
+ __ClangMajorVersion=4
+ __ClangMinorVersion=0
+ ;;
+
+ clang5.0|-clang5.0)
+ __ClangMajorVersion=5
+ __ClangMinorVersion=0
+ ;;
+
+ clang6.0|-clang6.0)
+ __ClangMajorVersion=6
+ __ClangMinorVersion=0
+ ;;
+
ninja)
__UseNinja=1
;;
@@ -686,9 +701,9 @@ export __CMakeBinDir="$__BinDir"
if [ ! -d "$__BinDir" ] || [ ! -d "$__BinDir/bin" ]; then
- echo "Cannot find build directory for the CoreCLR Product."
- echo "Please make sure CoreCLR is built before building tests."
- echo "Example use: './build.sh $__BuildArch $__BuildType'"
+ echo "Cannot find build directory for the CoreCLR Product or native tests."
+ echo "Please make sure CoreCLR and native tests are built before building managed tests."
+ echo "Example use: './build.sh $__BuildArch $__BuildType' without -skiptests switch"
exit 1
fi