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
|
Author: Gábor Németh <homar@riseup.net>
Subject: Sort error log before compare
Forwarded: https://gitlab.com/msc-generator/msc-generator/-/commits/ng-order
Tests can become flaky [1] due to undefined order of warnings.
As a temporary solution we sort error logs for tests until order
is stabilized in upstream.
[1] https://gitlab.com/msc-generator/msc-generator/-/jobs/11505507478/viewer
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 13d9e893..59a25737 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -48,7 +48,7 @@ $(1)/%.png: $(call addsrc,$(1)/%.$(2)) $$(MSCGEN)
%.exit: %.png pngdiff
$$(AM_V_at){ orig=$$(call addsrc,$$(call canon,$$*)); e=$$*.err_new; d=$$*.err_diff; \
{ [[ -f $$$$orig.err ]] && cat $$$$orig.err || echo Success.; } | \
- { $(WORD_DIFF) -- - $$*.err >$$$$d \
+ { $(WORD_DIFF) <(sort) <(sort $$*.err) >$$$$d \
&& { rm $$$$d; ./pngdiff $$< $$$$orig.png `[ ! -f $$<_nofont ] || echo $$<_nofont` && echo 0 || { echo $$$$?; mv $$< $$(patsubst %.png,%_new.png,$$<); } } \
|| { echo 4; mv $$*.err $$$$e; \
[[ $(AHA) != : ]] && $(AHA) -b -w <$$$$d >$$$$d.html && $(AHA) -b -w <$$$$e >$$$$e.html || true; } \
@@ -65,7 +65,7 @@ $(1): $(call addsrc,$(2)) $$(MSCGEN)
$(basename $(1)).exit: $(1) pngdiff
$$(AM_V_at){ err=$(call addsrc,$(call canon,$(basename $(2)))).err; e=$(basename $(2)).err; d=$$(basename $$@).err_diff; \
{ [[ -f $$$$err ]] && cat $$$$err || echo Success.; } | \
- { $(WORD_DIFF) -- - $$$$e >$$$$d \
+ { $(WORD_DIFF) <(sort) <(sort $$$$e) >$$$$d \
&& { rm $$$$d; ./pngdiff $$< $$(call addsrc,$$(call canon,$$<)) `[ ! -f $$<_nofont ] || echo $$<_nofont` && echo 0 || { echo $$$$?; mv $$< $$(patsubst %.png,%_new.png,$$<); } } \
|| { echo 4; cp $$$$e $$$${e}_new; \
[[ $(AHA) != : ]] && $(AHA) -b -w <$$$$d >$$$$d.html && $(AHA) -b -w <$$$${e}_new >$$$${e}_new.html || true; } \
|
