1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
Description: Don't suppress diff output in testsuite
Some tests in the testsuite compare an output to a reference file and fail if
they do not match. This comparison is done with diff, however some uses
suppress the output of diff (by using the -q option or redirecting to
/dev/null). That makes it hard to diagnose the test failure as the only visible
information is that the output does not match.
.
This patch changes the diff calls to allow the output to be visible. Retrieved
from upstream git, where it was added after the 2.0 release.
Author: Xiretza <xiretza@xiretza.xyz>
Origin: upstream, https://github.com/ghdl/ghdl/commit/a728cb60fb3c9b5df609e2e19c1b3d70b83e0784
Last-Update: 2022-12-04
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/testsuite/gna/issue394/testsuite.sh
+++ b/testsuite/gna/issue394/testsuite.sh
@@ -4,7 +4,7 @@
analyze bug.vhdl
elab_simulate bug > out.txt 2> err.txt
-diff_nocr -q out.txt out.ref
+diff_nocr out.txt out.ref
rm -f out.txt err.txt
clean
--- a/testsuite/gna/issue450/testsuite.sh
+++ b/testsuite/gna/issue450/testsuite.sh
@@ -12,7 +12,7 @@
$GHDL --vpi-link -v gcc -o vpi2.vpi vpi2.o
simulate disptree --vpi=./vpi2.vpi | tee disptree.out
- diff_nocr -q disptree.ref disptree.out
+ diff_nocr disptree.ref disptree.out
rm -f vpi2.o vpi2.vpi disptree.out
fi
--- a/testsuite/gna/issue719/testsuite.sh
+++ b/testsuite/gna/issue719/testsuite.sh
@@ -3,7 +3,7 @@
. ../../testenv.sh
analyze tb.vhdl 2> tb.out
-diff_nocr -q tb.ref tb.out
+diff_nocr tb.ref tb.out
rm -f tb.out
clean
--- a/testsuite/gna/issue880/testsuite.sh
+++ b/testsuite/gna/issue880/testsuite.sh
@@ -8,7 +8,7 @@
if ghdl_has_feature psl psl; then
simulate psl --psl-report=psl.out
- if ! diff_nocr psl.out psl.ref > /dev/null; then
+ if ! diff_nocr psl.out psl.ref; then
echo "report mismatch"
exit 1
fi
@@ -24,7 +24,7 @@
if ghdl_has_feature psl psl; then
simulate psl --psl-report=psl.out
- diff_nocr -q psl.out psl.ref
+ diff_nocr psl.out psl.ref
rm -f psl.out
fi
--- a/testsuite/gna/ticket24/testsuite.sh
+++ b/testsuite/gna/ticket24/testsuite.sh
@@ -8,7 +8,7 @@
if ghdl_has_feature psl psl; then
simulate psl --psl-report=psl.out
- if ! diff_nocr psl.out psl.ref > /dev/null; then
+ if ! diff_nocr psl.out psl.ref; then
echo "report mismatch"
exit 1
fi
@@ -24,7 +24,7 @@
if ghdl_has_feature psl psl; then
simulate psl --psl-report=psl.out
- diff_nocr -q psl.out psl.ref
+ diff_nocr psl.out psl.ref
rm -f psl.out
fi
|
