From 06b3451caf5ed8ad4f14c41d7dee2e8c32cdf393 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 9 Aug 2018 10:22:26 +0200 Subject: [PATCH] check: Do not fail if partial test prerequisites fail. * build-aux/check-tcc.sh: Pass if no test directory found. * build-aux/check.sh.in (TINYCC_PREFIX): Rename from TCC_PREFIX. Pass if partial tests prerequisites fail. --- build-aux/check-tcc.sh | 3 +++ build-aux/check.sh.in | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build-aux/check-tcc.sh b/build-aux/check-tcc.sh index 8e9f2ae1..75ddaf5c 100755 --- a/build-aux/check-tcc.sh +++ b/build-aux/check-tcc.sh @@ -141,6 +141,9 @@ MES_LIBS="-l c+gnu" expect=$(echo $broken | wc -w) ARGS="arg1 arg2 arg3 arg4 arg5" export ARGS +pass=0 +fail=0 +total=0 mkdir -p scaffold/tinycc for t in $tests; do if [ ! -f $TINYCC_PREFIX/"$t.c" ]; then diff --git a/build-aux/check.sh.in b/build-aux/check.sh.in index 0dac9f0c..aa877b3c 100755 --- a/build-aux/check.sh.in +++ b/build-aux/check.sh.in @@ -40,8 +40,14 @@ fi set -e -[ "$GUILE" != true ] && MES=guile bash ${srcdest}build-aux/check-mes.sh -[ "$MES" != guile ] && bash ${srcdest}build-aux/check-mes.sh +if [ "$GUILE" != true ]; then + MES=guile bash ${srcdest}build-aux/check-mes.sh +fi +if [ "$MES" != guile ]; then + bash ${srcdest}build-aux/check-mes.sh +fi bash ${srcdest}build-aux/check-boot.sh bash ${srcdest}build-aux/check-mescc.sh -[ -d $TINYCC_PREFIX/tests/tests2 ] && bash ${srcdest}build-aux/check-tcc.sh +if [ -d $TINYCC_PREFIX/tests/tests2 ] ;then + bash ${srcdest}build-aux/check-tcc.sh +fi