From 3f9e79925e8e329f28cbbca0b2a0bd1eb3fff237 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 13 Sep 2017 18:55:07 +0200
Subject: [PATCH] tests/bin/check.sh, process MINGW and MSYS test results like
 Linux

---
 tests/bin/check.sh | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/tests/bin/check.sh b/tests/bin/check.sh
index 56c7bff9e..4441153b3 100644
--- a/tests/bin/check.sh
+++ b/tests/bin/check.sh
@@ -25,21 +25,13 @@ testdir=`dirname $TEST`
 HOST_TYPE=`uname -srvm`
 
 case $HOST_TYPE in
-    MINGW*|MSYS*)
-      $SPICE --batch $testdir/$testname.cir -o $testname.test &&\
-      sed -e 's/e-000/e+000/g' $testname.test | sed 's/e-0/e-/g' | sed 's/e+0/e+/g' | egrep -v "$FILTER" > $testname.test_tmp &&\
-      sed -e 's/-0$/ 0/g' $testdir/$testname.out | egrep -v "$FILTER" > $testname.out_tmp
-      if diff -B -w -u $testname.out_tmp $testname.test_tmp; then
-          rm $testname.test $testname.test_tmp $testname.out_tmp
-          exit 0
-      fi
-      rm -f $testname.test_tmp $testname.out_tmp
-      sed -e 's/e-000/e+000/g' $testname.test | sed 's/e-0/e-/g' | sed 's/e+0/e+/g' > $testname.test_tmp
-      mv $testname.test_tmp $testname.test
-      ;;
-    Linux*|Darwin*|CYGWIN*)
-      $SPICE --batch $testdir/$testname.cir >$testname.test &&\
-      egrep -v "$FILTER" $testname.test > $testname.test_tmp &&\
+    Linux*|Darwin*|CYGWIN*|MINGW*|MSYS*)
+      $SPICE --batch $testdir/$testname.cir >$testname.test
+      # contrary to the c standard windows may print floating point values
+      #   with three instead of two exponential digits
+      sed -e 's/\([.0-9][eE][+-]\?\)0\([0-9]\{2\}\)/\1\2/g' \
+          <$testname.test | \
+      egrep -v "$FILTER" > $testname.test_tmp
       egrep -v "$FILTER" $testdir/$testname.out > $testname.out_tmp
       if diff -B -w -u $testname.out_tmp $testname.test_tmp; then
           rm $testname.test $testname.test_tmp $testname.out_tmp