From 9e7d54f0a5816f433f03271ea9f46bc7803e97e2 Mon Sep 17 00:00:00 2001 From: Xiretza Date: Tue, 27 Apr 2021 18:15:35 +0200 Subject: testsuite: try to determine ghwdump location automatically --- Makefile.in | 2 +- testsuite/testsuite.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 082596174..3d229c4e4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -291,7 +291,7 @@ install.gcc: install.grt uninstall.gcc: uninstall.grt test.gcc: - cd $(srcdir)/testsuite; GHDL=$(GHDL_GCC_BIN) ./testsuite.sh + cd $(srcdir)/testsuite; GHDL=$(GHDL_GCC_BIN) GHWDUMP=$(CURDIR)/ghwdump$(EXEEXT) ./testsuite.sh #################### For gcc backend - development only (local build) #### diff --git a/testsuite/testsuite.sh b/testsuite/testsuite.sh index 4c454d35c..cc1b91910 100755 --- a/testsuite/testsuite.sh +++ b/testsuite/testsuite.sh @@ -87,6 +87,15 @@ if [ "x$GHDL" = "x" ]; then fi fi +if [ "$GHWDUMP" = "" ]; then + case "$GHDL" in + */*) export GHWDUMP=${GHDL%/*}/ghwdump;; + *) export GHWDUMP=ghwdump;; + esac +fi + +command -v "$GHWDUMP" >/dev/null || die "ghwdump executable not found: $GHWDUMP" + cd $(dirname "$0") rm -f test_ok failures="" -- cgit v1.2.3