From 3f153b74876e0a5dce14402f98d2d348ecfacc95 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Fri, 24 Aug 2018 14:02:43 +0200
Subject: Improve execution of regression tests

- Make it possible to skip tests on some platforms
- Make it possible to expect a failure (typically: of the reference interpreter)
- Stop on error
---
 test/regression/Runtest | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'test/regression/Runtest')

diff --git a/test/regression/Runtest b/test/regression/Runtest
index ad2a58f1..f693219a 100755
--- a/test/regression/Runtest
+++ b/test/regression/Runtest
@@ -9,6 +9,9 @@ out="test$$.log"
 rm -f $out
 trap "rm -f $out" 0 INT QUIT
 
+# Is the test expected to fail?
+expect_fail=false
+
 # The architecture and the bitsize
 arch=`sed -n -e 's/^ARCH=//p' ../../Makefile.config`
 bits=`sed -n -e 's/^BITSIZE=//p' ../../Makefile.config`
@@ -26,10 +29,23 @@ else
   ref=""
 fi
 
+# Special conditions
+
+if test -f "$name.cond"; then
+  RUN=0 SKIP=1 EXPECT_FAIL=2 sh "$name.cond"
+  case "$?" in
+    1) echo "$name: skipped"; exit 0;;
+    2) expect_fail=true;;
+  esac
+fi
+
 # Administer the test
 if $SIMU $* > $out
 then
-  if test -n "$ref"; then
+  if $expect_fail; then
+    echo "$name: ERROR (should have failed but did not)"
+    exit 2
+  elif test -n "$ref"; then
     if cmp -s "$out" "$ref"; then
       echo "$name: passed"
       exit 0
@@ -43,7 +59,13 @@ then
     exit 0
   fi
 else
-  echo "$name: EXECUTION FAILED (status $?)"
-  exit 2
+  retcode=$?
+  if $expect_fail; then
+    echo "$name: passed (failed as expected)"
+    exit 0
+  else
+    echo "$name: EXECUTION FAILED (status $retcode)"
+    exit 2
+  fi
 fi
 
-- 
cgit