X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=validate;h=39fa819cd13dac705f9f4f4aaecdb940812b5408;hp=6ba8901a8274d1951ebf66a7b05b428211bd0543;hb=17c564cd00a506080b4f8436c0153296a3c86766;hpb=e1c1b8bcbeb8750da1ab88a3b0b841e5a39110bc diff --git a/validate b/validate index 6ba8901..39fa819 100644 --- a/validate +++ b/validate @@ -24,7 +24,10 @@ make -j2 make -C testsuite/tests/ghc-regress fast stage=2 CLEANUP=1 2>&1 | tee testlog -if grep '0 unexpected failures' testlog >/dev/null 2>/dev/null; then +if + grep '\<0 caused framework failures' testlog >/dev/null 2>/dev/null && + grep '\<0 unexpected passes' testlog >/dev/null 2>/dev/null && + grep '\<0 unexpected failures' testlog >/dev/null 2>/dev/null ; then echo "-------------------------------------------------------------------" echo "Congratulations! This tree is has passed minimal testing." echo @@ -37,7 +40,8 @@ if grep '0 unexpected failures' testlog >/dev/null 2>/dev/null; then echo "-------------------------------------------------------------------" else echo "-------------------------------------------------------------------" - echo "Oops! Looks like you have some test failures." + echo "Oops! Looks like you have some unexpected test results or" + echo "framework failures." echo "Please fix them before pushing/sending patches." echo "-------------------------------------------------------------------" fi