Minor build system changes to make ABITest work correctly on Linux.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72405 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/ABITest/Makefile.test.common b/utils/ABITest/Makefile.test.common
index 0094a2cbe06ec92ed162ce767c76aa96089357a1..3c208adf0c54ec0ac04998a40d414f555e875743 100644 (file)
--- a/utils/ABITest/Makefile.test.common
+++ b/utils/ABITest/Makefile.test.common
@@ -36,7 +36,7 @@ test.%.report: temps/test.%.xx.diff temps/test.%.xy.diff temps/test.%.yx.diff te
                        ok=0;\
                fi; \
        done; \
-       if [ $$ok == 1 ]; then \
+       if [ $$ok -eq 1 ]; then \
                true; \
        else \
                false; \

diff --git a/utils/ABITest/build.sh b/utils/ABITest/build.sh
index 1f504646d25e0c94c119ce7070414bfdf6d2d8ab..a50d14ab8d06f02128c937beb98908ceaf8405ab 100755 (executable)
--- a/utils/ABITest/build.sh
+++ b/utils/ABITest/build.sh
@@ -7,6 +7,6 @@ if [ $# != 1 ]; then
     exit 1
 fi
 
-CPUS=$(sysctl -n hw.ncpu)
+CPUS=2
 make -j $CPUS \
-  $(for i in $(zseq 0 $1); do echo test.$i.report; done) -k
+  $(for i in $(seq 0 $1); do echo test.$i.report; done) -k

diff --git a/utils/ABITest/layout/Makefile b/utils/ABITest/layout/Makefile
index fa76f18c243d6a64bfd1d49990e084173ea86452..0520625fcf29f850a47fe9e095adfabd2ced6810 100644 (file)
--- a/utils/ABITest/layout/Makefile
+++ b/utils/ABITest/layout/Makefile
@@ -12,7 +12,7 @@ TIMEOUT := 5
 CFLAGS := -std=gnu99
 
 X_COMPILER := llvm-gcc
-Y_COMPILER := xcc -ccc-clang
+Y_COMPILER := clang
 CC := gcc
 
 ifeq (0, 0)

diff --git a/utils/ABITest/summarize.sh b/utils/ABITest/summarize.sh
index 6dba41564bb8f0aa49d45edac3470487ba4bd63b..3efb52bf72278c59df624176f647c953f44f0415 100755 (executable)
--- a/utils/ABITest/summarize.sh
+++ b/utils/ABITest/summarize.sh
@@ -7,7 +7,7 @@ if [ $# != 1 ]; then
     exit 1
 fi
 
-for i in $(zseq 0 $1); do 
+for i in $(seq 0 $1); do 
     if (! make test.$i.report &> /dev/null); then 
         echo "FAIL: $i";
     fi;