From 98a208d6bef073fcbc6820447a21cbb6feed714e Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sun, 12 Mar 2023 16:17:23 -0700 Subject: [PATCH] vvp_reg.py: Allow to omit empty gold files vvp_reg.py requires 4 gold files. One for each of stdout and stderr of both iverilog and vvp. Most of these log files will be empty for most test cases. This will result in a lot of empty files being added to the repository. If a gold file for a specific output stream can not be found assume that the output stream is supposed to empty. This allows to omit the empty gold files. Also remove all the existing empty gold files. Signed-off-by: Lars-Peter Clausen --- ivtest/gold/br_gh13a-iverilog-stdout.gold | 0 ivtest/gold/br_gh13a-vlog95-iverilog-stdout.gold | 0 ivtest/gold/br_gh13a-vlog95-iverilog-vlog95-stderr.gold | 0 ivtest/gold/br_gh13a-vlog95-iverilog-vlog95-stdout.gold | 0 ivtest/gold/br_gh13a-vlog95-vvp-stderr.gold | 0 ivtest/gold/br_gh13a-vvp-stderr.gold | 0 ivtest/gold/dumpfile-iverilog-stderr.gold | 0 ivtest/gold/dumpfile-iverilog-stdout.gold | 0 ivtest/gold/dumpfile-vvp-stderr.gold | 0 ivtest/gold/macro_str_esc-iverilog-stderr.gold | 0 ivtest/gold/macro_str_esc-iverilog-stdout.gold | 0 ivtest/gold/macro_str_esc-vvp-stderr.gold | 0 ivtest/gold/param-width-iverilog-stderr.gold | 0 ivtest/gold/param-width-iverilog-stdout.gold | 0 ivtest/gold/param-width-vlog95-iverilog-stderr.gold | 0 ivtest/gold/param-width-vlog95-iverilog-stdout.gold | 0 .../gold/param-width-vlog95-iverilog-vlog95-stderr.gold | 0 .../gold/param-width-vlog95-iverilog-vlog95-stdout.gold | 0 ivtest/gold/param-width-vlog95-vvp-stderr.gold | 0 ivtest/gold/param-width-vvp-stderr.gold | 0 ivtest/run_ivl.py | 9 +++++++-- 21 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 ivtest/gold/br_gh13a-iverilog-stdout.gold delete mode 100644 ivtest/gold/br_gh13a-vlog95-iverilog-stdout.gold delete mode 100644 ivtest/gold/br_gh13a-vlog95-iverilog-vlog95-stderr.gold delete mode 100644 ivtest/gold/br_gh13a-vlog95-iverilog-vlog95-stdout.gold delete mode 100644 ivtest/gold/br_gh13a-vlog95-vvp-stderr.gold delete mode 100644 ivtest/gold/br_gh13a-vvp-stderr.gold delete mode 100644 ivtest/gold/dumpfile-iverilog-stderr.gold delete mode 100644 ivtest/gold/dumpfile-iverilog-stdout.gold delete mode 100644 ivtest/gold/dumpfile-vvp-stderr.gold delete mode 100644 ivtest/gold/macro_str_esc-iverilog-stderr.gold delete mode 100644 ivtest/gold/macro_str_esc-iverilog-stdout.gold delete mode 100644 ivtest/gold/macro_str_esc-vvp-stderr.gold delete mode 100644 ivtest/gold/param-width-iverilog-stderr.gold delete mode 100644 ivtest/gold/param-width-iverilog-stdout.gold delete mode 100644 ivtest/gold/param-width-vlog95-iverilog-stderr.gold delete mode 100644 ivtest/gold/param-width-vlog95-iverilog-stdout.gold delete mode 100644 ivtest/gold/param-width-vlog95-iverilog-vlog95-stderr.gold delete mode 100644 ivtest/gold/param-width-vlog95-iverilog-vlog95-stdout.gold delete mode 100644 ivtest/gold/param-width-vlog95-vvp-stderr.gold delete mode 100644 ivtest/gold/param-width-vvp-stderr.gold diff --git a/ivtest/gold/br_gh13a-iverilog-stdout.gold b/ivtest/gold/br_gh13a-iverilog-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/br_gh13a-vlog95-iverilog-stdout.gold b/ivtest/gold/br_gh13a-vlog95-iverilog-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/br_gh13a-vlog95-iverilog-vlog95-stderr.gold b/ivtest/gold/br_gh13a-vlog95-iverilog-vlog95-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/br_gh13a-vlog95-iverilog-vlog95-stdout.gold b/ivtest/gold/br_gh13a-vlog95-iverilog-vlog95-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/br_gh13a-vlog95-vvp-stderr.gold b/ivtest/gold/br_gh13a-vlog95-vvp-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/br_gh13a-vvp-stderr.gold b/ivtest/gold/br_gh13a-vvp-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/dumpfile-iverilog-stderr.gold b/ivtest/gold/dumpfile-iverilog-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/dumpfile-iverilog-stdout.gold b/ivtest/gold/dumpfile-iverilog-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/dumpfile-vvp-stderr.gold b/ivtest/gold/dumpfile-vvp-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/macro_str_esc-iverilog-stderr.gold b/ivtest/gold/macro_str_esc-iverilog-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/macro_str_esc-iverilog-stdout.gold b/ivtest/gold/macro_str_esc-iverilog-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/macro_str_esc-vvp-stderr.gold b/ivtest/gold/macro_str_esc-vvp-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/param-width-iverilog-stderr.gold b/ivtest/gold/param-width-iverilog-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/param-width-iverilog-stdout.gold b/ivtest/gold/param-width-iverilog-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/param-width-vlog95-iverilog-stderr.gold b/ivtest/gold/param-width-vlog95-iverilog-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/param-width-vlog95-iverilog-stdout.gold b/ivtest/gold/param-width-vlog95-iverilog-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/param-width-vlog95-iverilog-vlog95-stderr.gold b/ivtest/gold/param-width-vlog95-iverilog-vlog95-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/param-width-vlog95-iverilog-vlog95-stdout.gold b/ivtest/gold/param-width-vlog95-iverilog-vlog95-stdout.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/param-width-vlog95-vvp-stderr.gold b/ivtest/gold/param-width-vlog95-vvp-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/gold/param-width-vvp-stderr.gold b/ivtest/gold/param-width-vvp-stderr.gold deleted file mode 100644 index e69de29bb..000000000 diff --git a/ivtest/run_ivl.py b/ivtest/run_ivl.py index f6654e8d9..19edc0b29 100644 --- a/ivtest/run_ivl.py +++ b/ivtest/run_ivl.py @@ -90,8 +90,13 @@ def compare_files(log_path, gold_path): with open(log_path, 'rt') as fd: a = fd.readlines() - with open(gold_path, 'rt') as fd: - b = fd.readlines() + + # Allow to omit empty gold files + if os.path.exists(gold_path): + with open(gold_path, 'rt') as fd: + b = fd.readlines() + else: + b = [] flag = a == b if not flag: