From e72d372d73e92453593b8bc69cda68061be9e68d Mon Sep 17 00:00:00 2001 From: Zachary Snow Date: Tue, 8 Dec 2020 11:39:17 -0700 Subject: [PATCH] omit reference file for verilog-compatible test inputs --- test/basic/attr.v | 1 - test/basic/div.v | 1 - test/basic/else_prec.v | 2 -- test/basic/flatten.v | 2 -- test/basic/flatten_three.v | 2 -- test/basic/gate.v | 2 -- test/basic/packed_array_shadow.v | 2 -- test/basic/shift.v | 1 - test/basic/stmt_task.v | 1 - test/basic/typeof_op.v | 1 - test/lex/cond.v | 2 -- test/lex/file_line.v | 2 -- test/lex/macro_boundary.v | 1 - test/lex/macro_iv.v | 2 -- test/lex/macro_string.v | 1 - test/lex/macro_whitespace.v | 1 - test/lex/no_newline.v | 6 ------ test/lex/number.v | 1 - test/lib/functions.sh | 9 ++++++++- 19 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 test/basic/attr.v delete mode 100644 test/basic/div.v delete mode 100644 test/basic/else_prec.v delete mode 100644 test/basic/flatten.v delete mode 100644 test/basic/flatten_three.v delete mode 100644 test/basic/gate.v delete mode 100644 test/basic/packed_array_shadow.v delete mode 100644 test/basic/shift.v delete mode 100644 test/basic/stmt_task.v delete mode 100644 test/basic/typeof_op.v delete mode 100644 test/lex/cond.v delete mode 100644 test/lex/file_line.v delete mode 100644 test/lex/macro_boundary.v delete mode 100644 test/lex/macro_iv.v delete mode 100644 test/lex/macro_string.v delete mode 100644 test/lex/macro_whitespace.v delete mode 100644 test/lex/no_newline.v delete mode 100644 test/lex/number.v diff --git a/test/basic/attr.v b/test/basic/attr.v deleted file mode 100644 index eadb3c6..0000000 --- a/test/basic/attr.v +++ /dev/null @@ -1 +0,0 @@ -`include "attr.sv" diff --git a/test/basic/div.v b/test/basic/div.v deleted file mode 100644 index 40d6d89..0000000 --- a/test/basic/div.v +++ /dev/null @@ -1 +0,0 @@ -`include "div.sv" diff --git a/test/basic/else_prec.v b/test/basic/else_prec.v deleted file mode 100644 index a3702d4..0000000 --- a/test/basic/else_prec.v +++ /dev/null @@ -1,2 +0,0 @@ -// Reference file is already plain Verilog -`include "else_prec.sv" diff --git a/test/basic/flatten.v b/test/basic/flatten.v deleted file mode 100644 index 2c7a10a..0000000 --- a/test/basic/flatten.v +++ /dev/null @@ -1,2 +0,0 @@ -// iverilog supports multi-dimensional packed arrays -`include "flatten.sv" diff --git a/test/basic/flatten_three.v b/test/basic/flatten_three.v deleted file mode 100644 index c734201..0000000 --- a/test/basic/flatten_three.v +++ /dev/null @@ -1,2 +0,0 @@ -// iverilog supports multi-dimensional packed arrays -`include "flatten_three.sv" diff --git a/test/basic/gate.v b/test/basic/gate.v deleted file mode 100644 index 25d5be3..0000000 --- a/test/basic/gate.v +++ /dev/null @@ -1,2 +0,0 @@ -// This test is for parser coverge only. -`include "gate.sv" diff --git a/test/basic/packed_array_shadow.v b/test/basic/packed_array_shadow.v deleted file mode 100644 index 81f94d1..0000000 --- a/test/basic/packed_array_shadow.v +++ /dev/null @@ -1,2 +0,0 @@ -// iverilog has support for packed arrays and functions -`include "packed_array_shadow.sv" diff --git a/test/basic/shift.v b/test/basic/shift.v deleted file mode 100644 index 61122e0..0000000 --- a/test/basic/shift.v +++ /dev/null @@ -1 +0,0 @@ -`include "shift.sv" diff --git a/test/basic/stmt_task.v b/test/basic/stmt_task.v deleted file mode 100644 index 722bd6a..0000000 --- a/test/basic/stmt_task.v +++ /dev/null @@ -1 +0,0 @@ -`include "stmt_task.sv" diff --git a/test/basic/typeof_op.v b/test/basic/typeof_op.v deleted file mode 100644 index b798b77..0000000 --- a/test/basic/typeof_op.v +++ /dev/null @@ -1 +0,0 @@ -`include "typeof_op.sv" diff --git a/test/lex/cond.v b/test/lex/cond.v deleted file mode 100644 index c0c9520..0000000 --- a/test/lex/cond.v +++ /dev/null @@ -1,2 +0,0 @@ -// use iverilog as reference -`include "cond.sv" diff --git a/test/lex/file_line.v b/test/lex/file_line.v deleted file mode 100644 index f1546d2..0000000 --- a/test/lex/file_line.v +++ /dev/null @@ -1,2 +0,0 @@ -// use iverilog as reference -`include "file_line.sv" diff --git a/test/lex/macro_boundary.v b/test/lex/macro_boundary.v deleted file mode 100644 index 6457f3f..0000000 --- a/test/lex/macro_boundary.v +++ /dev/null @@ -1 +0,0 @@ -`include "macro_boundary.sv" diff --git a/test/lex/macro_iv.v b/test/lex/macro_iv.v deleted file mode 100644 index 5685240..0000000 --- a/test/lex/macro_iv.v +++ /dev/null @@ -1,2 +0,0 @@ -// use iverilog as reference -`include "macro_iv.sv" diff --git a/test/lex/macro_string.v b/test/lex/macro_string.v deleted file mode 100644 index 74d56f0..0000000 --- a/test/lex/macro_string.v +++ /dev/null @@ -1 +0,0 @@ -`include "macro_string.sv" diff --git a/test/lex/macro_whitespace.v b/test/lex/macro_whitespace.v deleted file mode 100644 index 1bad827..0000000 --- a/test/lex/macro_whitespace.v +++ /dev/null @@ -1 +0,0 @@ -`include "macro_whitespace.sv" diff --git a/test/lex/no_newline.v b/test/lex/no_newline.v deleted file mode 100644 index 8234ad5..0000000 --- a/test/lex/no_newline.v +++ /dev/null @@ -1,6 +0,0 @@ -`include "no_newline.vh" -module top; -`ifdef A - initial $display("A is defined!"); -`endif -endmodule diff --git a/test/lex/number.v b/test/lex/number.v deleted file mode 100644 index 2dc2720..0000000 --- a/test/lex/number.v +++ /dev/null @@ -1 +0,0 @@ -`include "number.sv" diff --git a/test/lib/functions.sh b/test/lib/functions.sh index 902b06e..f2712b2 100644 --- a/test/lib/functions.sh +++ b/test/lib/functions.sh @@ -85,7 +85,14 @@ simpleTest() { tb=$3 assertConverts $sv - assertConverts $ve + + # some tests use inputs compatible with iverilog directly and so omit the + # reference manually converted file + if [ ! -f $ve ]; then + ve=$sv + else + assertConverts $ve + fi # some tests don't have a separate testbench, instead having the top-level # module defined in both of the input files