testsuite/testenv.sh (diff_nocr): New wrapper; use it where needed.

Option --strip-trailing-cr is used only on windows.

3 files changed, 3 insertions, 3 deletions

diff --git a/testsuite/synth/issue1428/testsuite.sh b/testsuite/synth/issue1428/testsuite.sh
index d7d647dd1..9ad80ad25 100755
--- a/testsuite/synth/issue1428/testsuite.sh
+++ b/testsuite/synth/issue1428/testsuite.sh
@@ -5,7 +5,7 @@
 for t in rec1 rec2 rec3 repro1 repro2 repro3 repro4b repro4 repro5b repro5 repro6
 do
     synth --expect-failure $t.vhdl -e 2>&1 | grep $t.vhdl: > $t.out
-    diff --strip-trailing-cr $t.out $t.ref
+    diff_nocr $t.out $t.ref
 done
 
 echo "Test successful"
diff --git a/testsuite/synth/sns01/testsuite.sh b/testsuite/synth/sns01/testsuite.sh
index 4a4ff76cd..20f3372c6 100755
--- a/testsuite/synth/sns01/testsuite.sh
+++ b/testsuite/synth/sns01/testsuite.sh
@@ -14,7 +14,7 @@ for f in adds subs unaries muls cmplt cmple cmpgt cmpge cmpeq cmpne shrs exts; d
     analyze tb_$f.vhdl
     elab_simulate tb_$f > $f.out
 
-    diff --strip-trailing-cr $f.out $f.ref
+    diff_nocr $f.out $f.ref
 done
 
 for t in sns01; do
diff --git a/testsuite/synth/snsuns01/testsuite.sh b/testsuite/synth/snsuns01/testsuite.sh
index 453469303..7c67c425c 100755
--- a/testsuite/synth/snsuns01/testsuite.sh
+++ b/testsuite/synth/snsuns01/testsuite.sh
@@ -15,7 +15,7 @@ for s in u s; do
         analyze tb_$f.vhdl
         elab_simulate tb_$f > $s$f.out
 
-        diff --strip-trailing-cr $s$f.out $s$f.ref
+        diff_nocr $s$f.out $s$f.ref
     done
 
   clean