diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2008-09-04 00:30:11 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2008-09-04 00:30:11 +0000 |
| commit | 0f999128682a932e2342908673198f3c06153ac8 (patch) | |
| tree | 46fe8705ae28af446d4939fec46ef26ac41e7668 /clang/test | |
| parent | 5047f71f3ec97f3dc4131ef8cf0ac1867d53d454 (diff) | |
| download | bcm5719-llvm-0f999128682a932e2342908673198f3c06153ac8.tar.gz bcm5719-llvm-0f999128682a932e2342908673198f3c06153ac8.zip | |
Update TestRunner to not report failure for XFAIL tests
llvm-svn: 55751
Diffstat (limited to 'clang/test')
| -rwxr-xr-x | clang/test/TestRunner.sh | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/clang/test/TestRunner.sh b/clang/test/TestRunner.sh index 767d9660d58..455674cc025 100755 --- a/clang/test/TestRunner.sh +++ b/clang/test/TestRunner.sh @@ -61,7 +61,12 @@ grep 'RUN:' $FILENAME | \ -e "s|%t|$TEMPOUTPUT|g" \ -e "s|clang|$CLANG|g" > $SCRIPT -grep -q XFAIL $FILENAME && (printf "XFAILED '$TESTNAME': "; grep XFAIL $FILENAME) +IS_XFAIL=0 +if (grep -q XFAIL $FILENAME); then + IS_XFAIL=1 + printf "XFAILED '$TESTNAME': " + grep XFAIL $FILENAME +fi /bin/sh $SCRIPT > $OUTPUT 2>&1 SCRIPT_STATUS=$? @@ -72,12 +77,22 @@ else VG_STATUS=0 fi +if [ $IS_XFAIL -ne 0 ]; then + if [ $SCRIPT_STATUS -ne 0 ]; then + SCRIPT_STATUS=0 + else + SCRIPT_STATUS=1 + fi +fi + if [ $SCRIPT_STATUS -ne 0 -o $VG_STATUS -ne 0 ]; then echo "******************** TEST '$TESTNAME' FAILED! ********************" echo "Command: " cat $SCRIPT if [ $SCRIPT_STATUS -eq 0 ]; then echo "Output:" + elif [ $IS_XFAIL -ne 0 ]; then + echo "Incorrect Output (Expected Failure):" else echo "Incorrect Output:" fi |
