test runner automatically handles tests with top-level module inside both inputs

02e948f2 · Zachary Snow · 3bef2b9c · 3bef2b9c · 3bef2b9c · 3bef2b9c
Commit 02e948f2 authored May 10, 2019 by Zachary Snow
10 changed files
--- a/test/basic/enum_tb.v
+++ b/test/basic/enum_tb.v
-// intentionally empty
--- a/test/basic/named_block_tb.v
+++ b/test/basic/named_block_tb.v
-// intentionally empty
--- a/test/basic/package_tb.v
+++ b/test/basic/package_tb.v
-// intentionally empty
--- a/test/basic/packed_array_shadow_tb.v
+++ b/test/basic/packed_array_shadow_tb.v
-// intentionally empty
--- a/test/basic/part_select_tb.v
+++ b/test/basic/part_select_tb.v
-// intentionally empty
--- a/test/basic/struct_shadow_tb.v
+++ b/test/basic/struct_shadow_tb.v
-// intentionally empty
--- a/test/basic/tf_block_tb.v
+++ b/test/basic/tf_block_tb.v
-// intentionally empty
--- a/test/basic/top_tf_tb.v
+++ b/test/basic/top_tf_tb.v
-// intentionally empty
--- a/test/lex/run.sh
+++ b/test/lex/run.sh
 #!/bin/bash
-NO_SEPARATE_TBS=1
 source ../lib/runner.sh
--- a/test/lib/runner.sh
+++ b/test/lib/runner.sh
@@ -66,16 +66,18 @@ assertConverts() {
 simpleTest() {
    sv="$1"
    ve="$2"
-    if [ -z ${NO_SEPARATE_TBS} ]; then
    tb="$3"
-    else
-        tb="$SCRIPT_DIR/empty.v"
-    fi

    assertNotNull "SystemVerilog file not specified" $sv
    assertNotNull "Verilog file not specified" $ve
    assertNotNull "Testbench not specified" $tb

+    # some tests don't have a separate testbench, instead having the top-level
+    # module defined in both of the input files
+    if [ ! -f "$tb" ]; then
+        tb="$SCRIPT_DIR/empty.v"
+    fi
+
    assertExists $sv
    assertExists $ve
    assertExists $tb