From 1fd785f564b42cc838ab065fe310fa32401de06d Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Mon, 25 May 2009 22:07:09 +0000 Subject: Minor build system changes to make ABITest work correctly on Linux. llvm-svn: 72405 --- clang/utils/ABITest/Makefile.test.common | 2 +- clang/utils/ABITest/build.sh | 4 ++-- clang/utils/ABITest/layout/Makefile | 2 +- clang/utils/ABITest/summarize.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'clang') diff --git a/clang/utils/ABITest/Makefile.test.common b/clang/utils/ABITest/Makefile.test.common index 0094a2cbe06..3c208adf0c5 100644 --- a/clang/utils/ABITest/Makefile.test.common +++ b/clang/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/clang/utils/ABITest/build.sh b/clang/utils/ABITest/build.sh index 1f504646d25..a50d14ab8d0 100755 --- a/clang/utils/ABITest/build.sh +++ b/clang/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/clang/utils/ABITest/layout/Makefile b/clang/utils/ABITest/layout/Makefile index fa76f18c243..0520625fcf2 100644 --- a/clang/utils/ABITest/layout/Makefile +++ b/clang/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/clang/utils/ABITest/summarize.sh b/clang/utils/ABITest/summarize.sh index 6dba41564bb..3efb52bf722 100755 --- a/clang/utils/ABITest/summarize.sh +++ b/clang/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; -- cgit v1.2.3