diff options
author | Matt Johnston <matt@ucc.asn.au> | 2007-02-03 08:20:30 +0000 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2007-02-03 08:20:30 +0000 |
commit | c5fd7dd5548f28e32d846e39d17e5c4de4e769af (patch) | |
tree | 81b522e272facfb27ff614936b4988bf6569ef2d /libtomcrypt/build.sh | |
parent | 5092e30605dfc5c45990d91cf606990e5c768255 (diff) | |
parent | 4a5208512ba02f735acbf7e948ed02353583581e (diff) |
merge of '1250b8af44b62d8f4fe0f8d9fc7e7a1cc34e7e1c'
and '7f8670ac3bb975f40967f3979d09d2199b7e90c8'
--HG--
extra : convert_revision : 6b61c50f4cf888bea302ac8fcf5dbb573b443251
Diffstat (limited to 'libtomcrypt/build.sh')
-rw-r--r-- | libtomcrypt/build.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libtomcrypt/build.sh b/libtomcrypt/build.sh index a018aac..a048670 100644 --- a/libtomcrypt/build.sh +++ b/libtomcrypt/build.sh @@ -2,12 +2,12 @@ echo "$1 ($2, $3)..." make clean 1>/dev/null 2>/dev/null echo -n "building..." -CFLAGS="$2 $CFLAGS" make -j3 -f $3 test tv_gen 1>gcc_1.txt 2>gcc_2.txt || (echo "build $1 failed see gcc_2.txt for more information" && cat gcc_2.txt && exit 1) +CFLAGS="$2 $CFLAGS $4" EXTRALIBS="$5" make -j4 -f $3 test tv_gen 1>gcc_1.txt 2>gcc_2.txt || (echo "build $1 failed see gcc_2.txt for more information" && cat gcc_2.txt && exit 1) echo -n "testing..." if [ -a test ] && [ -f test ] && [ -x test ]; then ((./test >test_std.txt 2>test_err.txt && ./tv_gen > tv.txt) && echo "$1 test passed." && echo "y" > testok.txt) || (echo "$1 test failed" && cat test_err.txt && exit 1) if find *_tv.txt -type f 1>/dev/null 2>/dev/null ; then - for f in *_tv.txt; do if (diff $f notes/$f) then true; else (echo "tv_gen $f failed" && rm -f testok.txt && exit 1); fi; done + for f in *_tv.txt; do if (diff --ignore-case $f notes/$f) then true; else (echo "tv_gen $f failed" && rm -f testok.txt && exit 1); fi; done fi fi if [ -a testok.txt ] && [ -f testok.txt ]; then @@ -16,5 +16,5 @@ fi exit 1 # $Source: /cvs/libtom/libtomcrypt/build.sh,v $ -# $Revision: 1.5 $ -# $Date: 2005/06/27 13:04:05 $ +# $Revision: 1.9 $ +# $Date: 2006/03/18 14:10:55 $ |