aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2009-05-25 22:07:09 +0000
committerEli Friedman <eli.friedman@gmail.com>2009-05-25 22:07:09 +0000
commitd9d38c43c3a04984634a9deebc9014977d6cb945 (patch)
treec6bcbb83fa1092e0426b3e2734cd7d82ba766461
parent98a7170db80e43195068a2710088fd5532924c77 (diff)
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
-rw-r--r--utils/ABITest/Makefile.test.common2
-rwxr-xr-xutils/ABITest/build.sh4
-rw-r--r--utils/ABITest/layout/Makefile2
-rwxr-xr-xutils/ABITest/summarize.sh2
4 files changed, 5 insertions, 5 deletions
diff --git a/utils/ABITest/Makefile.test.common b/utils/ABITest/Makefile.test.common
index 0094a2cbe0..3c208adf0c 100644
--- 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 1f504646d2..a50d14ab8d 100755
--- 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 fa76f18c24..0520625fcf 100644
--- 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 6dba41564b..3efb52bf72 100755
--- 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;