From a1ad6aaf18edd20bbcae1951559437a75fad3967 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Tue, 27 Apr 2021 06:15:26 +0200
Subject: testsuite/testenv.sh: Add ghw_dump function

Also define ghw_dump to have only one function that calls GHWDUMP.
---
 testsuite/gna/issue1326/testsuite.sh |  2 +-
 testsuite/testenv.sh                 | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'testsuite')

diff --git a/testsuite/gna/issue1326/testsuite.sh b/testsuite/gna/issue1326/testsuite.sh
index 3c7edba08..082a04bf8 100755
--- a/testsuite/gna/issue1326/testsuite.sh
+++ b/testsuite/gna/issue1326/testsuite.sh
@@ -8,7 +8,7 @@ if ghdl_has_feature mytestbench ghw; then
   elab_simulate mytestbench --wave=dump.ghw | tee mytestbench.out
 
   # We're just checking that ghwdump doesn't crash on a zero length signal.
-  "${GHWDUMP:-ghwdump}" -ths dump.ghw > dump.txt
+  ghw_dump dump
 
   rm -f mytestbench.out dump.txt dump.ghw
 fi
diff --git a/testsuite/testenv.sh b/testsuite/testenv.sh
index c2b042479..4c3a3c33a 100644
--- a/testsuite/testenv.sh
+++ b/testsuite/testenv.sh
@@ -107,10 +107,23 @@ elab_simulate_failure ()
   "$GHDL" --elab-run $GHDL_STD_FLAGS $GHDL_FLAGS $@ --expect-failure
 }
 
+# Call ghwdump
+ghw_dump ()
+{
+  if [ x"$GHWDUMP" = x ]; then
+    case "$GHDL" in
+      */*) export GHWDUMP=$(dirname $GHDL)/ghwdump;;
+      *) export GHWDUMP=ghwdump;;
+    esac
+  fi
+
+  "$GHWDUMP" -ths "$1".ghw > "$1".txt
+}
+
 # Compare the dump of a GHW wave and a previous golden dump
 ghw_diff ()
 {
-  "${GHWDUMP:-ghwdump}" -ths "$1".ghw > "$1".txt
+  ghw_dump "$1"
   if diff --strip-trailing-cr "$1".txt golden_"$1".txt; then
     echo "The ghw dump matches."
   else
-- 
cgit v1.2.3