diff options
| author | umarcor <unai.martinezcorral@ehu.eus> | 2021-04-23 14:18:15 +0200 |
|---|---|---|
| committer | umarcor <unai.martinezcorral@ehu.eus> | 2021-04-23 14:28:07 +0200 |
| commit | d79fa58f7efc06a048adf9e2172792e64b8abb20 (patch) | |
| tree | adb21b7580a4a32a11c46adc13a340ca2aa2f6dc | |
| parent | 82cdb8faaedfaa0c7e860aa024e13bf25e0618b3 (diff) | |
| download | ghdl-d79fa58f7efc06a048adf9e2172792e64b8abb20.tar.gz ghdl-d79fa58f7efc06a048adf9e2172792e64b8abb20.tar.bz2 ghdl-d79fa58f7efc06a048adf9e2172792e64b8abb20.zip | |
ci: set and use GHWDUMP envvar
Since the tests are executed without installing the package,
the ones that depend on ghwdump do fail on AppVeyor.
Use envvar GHWDUMP in testenv for optionally specifying the location.
| -rw-r--r-- | scripts/windows/appveyor/test.ps1 | 1 | ||||
| -rwxr-xr-x | testsuite/gna/issue1326/testsuite.sh | 2 | ||||
| -rw-r--r-- | testsuite/testenv.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/scripts/windows/appveyor/test.ps1 b/scripts/windows/appveyor/test.ps1 index 59faab113..3eaefc827 100644 --- a/scripts/windows/appveyor/test.ps1 +++ b/scripts/windows/appveyor/test.ps1 @@ -50,6 +50,7 @@ Write-Host "Run testsuites..." -ForegroundColor Yellow cd "$($env:APPVEYOR_BUILD_FOLDER)\testsuite" # Use a MinGW compatible path $env:GHDL="$($env:GHDL_PREFIX_DIR)/bin/ghdl.exe" +$env:GHWDUMP="$($env:GHDL_PREFIX_DIR)/bin/ghwdump.exe" # Exit status $Err = 0 diff --git a/testsuite/gna/issue1326/testsuite.sh b/testsuite/gna/issue1326/testsuite.sh index d861ffdcf..3c7edba08 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 -ths dump.ghw > dump.txt + "${GHWDUMP:-ghwdump}" -ths dump.ghw > dump.txt rm -f mytestbench.out dump.txt dump.ghw fi diff --git a/testsuite/testenv.sh b/testsuite/testenv.sh index 7db202097..0d27c4a72 100644 --- a/testsuite/testenv.sh +++ b/testsuite/testenv.sh @@ -106,7 +106,7 @@ elab_simulate_failure () # Compare the dump of a GHW wave and a previous golden dump ghw_diff () { - ghwdump -ths "$1".ghw > "$1".txt + "${GHWDUMP:-ghwdump}" -ths "$1".ghw > "$1".txt if diff --strip-trailing-cr "$1".txt golden_"$1".txt; then echo "The ghw dump matches." else |