From 08cc1f5159c318a8baf74bcd7893a8ac31630713 Mon Sep 17 00:00:00 2001
From: Prashanth Mundkur <prashanth.mundkur@gmail.com>
Date: Tue, 26 Nov 2019 17:00:49 -0800
Subject: For now, skip F/D tests on OCaml, and D tests on C-32.

---
 test/run_tests.sh | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/test/run_tests.sh b/test/run_tests.sh
index 5ddf8f5..dceeae9 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -61,10 +61,16 @@ else
 fi
 for test in $DIR/riscv-tests/rv32*.elf; do
     # skip D tests on RV32
-    if [[ "$(basename $test)" =~ rv32ud-*.elf ]];
+    pat="rv32ud-.+elf"
+    if [[ $(basename $test) =~ $pat ]];
     then continue
     fi
-    if $RISCVDIR/ocaml_emulator/riscv_ocaml_sim_RV32 "$test" >"${test/.elf/.out}" 2>&1 && grep -q SUCCESS "${test/.elf/.out}"
+    # skip F tests on RV32 OCaml for now
+    pat="rv32uf-.+elf"
+    if [[ $(basename $test) =~ $pat ]];
+    then continue
+    fi
+    if $RISCVDIR/ocaml_emulator/riscv_ocaml_sim_RV32 "$test" >"${test/.elf/.out}" 2>&1 && grep -q SUCCESS "${test/.elf/.out}" */
     then
        green "OCaml-32 $(basename $test)" "ok"
     else
@@ -81,8 +87,9 @@ else
     red "Building 32-bit RISCV C emulator" "fail"
 fi
 for test in $DIR/riscv-tests/rv32*.elf; do
-    # skip D tests on RV32
-    if [[ "$(basename $test)" =~ rv32ud-*.elf ]];
+    # skip D tests on C RV32
+    pat='rv32ud-.+elf'
+    if [[ $(basename $test) =~ $pat ]];
     then continue
     fi
     if timeout 5 $RISCVDIR/c_emulator/riscv_sim_RV32 -p $test > ${test%.elf}.cout 2>&1 && grep -q SUCCESS ${test%.elf}.cout
@@ -106,6 +113,15 @@ else
     red "Building 64-bit RISCV OCaml emulator" "fail"
 fi
 for test in $DIR/riscv-tests/rv64*.elf; do
+    # skip F/D tests on OCaml for now
+    pat='rv64ud-.+elf'
+    if [[ $(basename $test) =~ $pat ]];
+    then continue
+    fi
+    pat='rv64uf-.+elf'
+    if [[ $(basename $test) =~ $pat ]];
+    then continue
+    fi
     if $RISCVDIR/ocaml_emulator/riscv_ocaml_sim_RV64 "$test" >"${test/.elf/.out}" 2>&1 && grep -q SUCCESS "${test/.elf/.out}"
     then
        green "OCaml-64 $(basename $test)" "ok"
-- 
cgit v1.1