diff options
| author | Tom Deseyn <tom.deseyn@gmail.com> | 2017-06-07 08:39:25 +0200 |
|---|---|---|
| committer | Tom Deseyn <tom.deseyn@gmail.com> | 2017-06-07 08:39:25 +0200 |
| commit | 48bc0fa682d6e45c4d9b27ecc460520b44094bc0 (patch) | |
| tree | a6140a7eea52d4b6e5d15149fbfea7583fcb718f /build-test.sh | |
| parent | bf37adf13f844eff9b8693b62cefe2853bed7346 (diff) | |
| download | coreclr-48bc0fa682d6e45c4d9b27ecc460520b44094bc0.tar.gz coreclr-48bc0fa682d6e45c4d9b27ecc460520b44094bc0.tar.bz2 coreclr-48bc0fa682d6e45c4d9b27ecc460520b44094bc0.zip | |
build{,-test}.sh: revert and add list of unsupported rids
Diffstat (limited to 'build-test.sh')
| -rwxr-xr-x | build-test.sh | 56 |
1 files changed, 14 insertions, 42 deletions
diff --git a/build-test.sh b/build-test.sh index af09e255d4..ee296a3004 100755 --- a/build-test.sh +++ b/build-test.sh @@ -41,49 +41,21 @@ initTargetDistroRid() isMSBuildOnNETCoreSupported() { - # This needs to be updated alongwith corresponding changes to netci.groovy. - __isMSBuildOnNETCoreSupported=0 - - if [ "$__HostArch" == "x64" ]; then - if [ "$__HostOS" == "Linux" ]; then - case "$__HostDistroRid" in - "centos.7-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "debian.8-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.23-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "fedora.24-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "opensuse.42.1-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "rhel.7"*"-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.14.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.04-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "ubuntu.16.10-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - "alpine.3.4.3-x64") - __isMSBuildOnNETCoreSupported=1 - ;; - *) - __isMSBuildOnNETCoreSupported=$__msbuildonunsupportedplatform - esac - elif [ "$__HostOS" == "OSX" ]; then - __isMSBuildOnNETCoreSupported=1 - fi + __isMSBuildOnNETCoreSupported=$__msbuildonunsupportedplatform + + if [ $__isMSBuildOnNETCoreSupported == 1 ]; then + return fi + + __isMSBuildOnNETCoreSupported=1 + UNSUPPORTED_RIDS=("*-arm" "*-arm64" "*-x86" "debian.9-x64" "ubuntu.17.04-x64") + for UNSUPPORTED_RID in "${UNSUPPORTED_RIDS[@]}" + do + if [[ "$__HostDistroRid" == $UNSUPPORTED_RID ]]; then + __isMSBuildOnNETCoreSupported=0 + break + fi + done } build_Tests() |