components/convmv/patches/test.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Wed, 06 Jan 2016 04:19:50 -0800
changeset 5232 902d18d42945
parent 3859 c3d5649bad5c
permissions -rw-r--r--
22503479 Upgrade Wireshark to version 1.12.9 22496202 problem in UTILITY/WIRESHARK 22501938 problem in UTILITY/WIRESHARK 22501946 problem in UTILITY/WIRESHARK 22501961 problem in UTILITY/WIRESHARK 22501972 problem in UTILITY/WIRESHARK 22501980 problem in UTILITY/WIRESHARK 22501994 problem in UTILITY/WIRESHARK 22502001 problem in UTILITY/WIRESHARK 22502011 problem in UTILITY/WIRESHARK 22502019 problem in UTILITY/WIRESHARK 22502029 problem in UTILITY/WIRESHARK 22502036 problem in UTILITY/WIRESHARK 22502052 problem in UTILITY/WIRESHARK 22502063 problem in UTILITY/WIRESHARK 22502077 problem in UTILITY/WIRESHARK 22502092 problem in UTILITY/WIRESHARK 22502104 problem in UTILITY/WIRESHARK 22502112 problem in UTILITY/WIRESHARK 22502124 problem in UTILITY/WIRESHARK 22502136 problem in UTILITY/WIRESHARK 22502147 problem in UTILITY/WIRESHARK 22502156 problem in UTILITY/WIRESHARK 22502172 problem in UTILITY/WIRESHARK

# Patch origin: internal.
# Causes test results to be uniform. Will not be submitted upstream.

# sed is used rather than a patch to dotests.sh because sorting the output of
# every invocation of $CONVMV is a repetitive change, and using a patch would
# require that patch to change if the test script ever changed, e.g. to add
# additional test cases, whereas this sed line can remain the same.

# Also, if a patch were used, it would either have to be applied when the test
# target is run, or testsuite.tar would have to be unpacked during prep.

# In-place sed (gsed -i) is not used because we want to use a new file name,
# so that running the test target repeatedly does not sed an already sed'ed
# file.

--- Makefile	Mon Feb 23 14:51:24 2015
+++ Makefile	Mon Feb 23 14:50:47 2015
@@ -22,7 +22,9 @@
 
 test:
 	test -d suite || $(TAR) xf testsuite.tar
-	cd suite ; ./dotests.sh
+	$(SED) -e 's/\($$CONVMV.*\)$$/& 2>\&1 | LC_ALL='C' $$SORT/' < suite/dotests.sh > suite/dotests-deterministic.sh
+	chmod +x suite/dotests-deterministic.sh
+	cd suite ; ./dotests-deterministic.sh
 
 dist: clean
 	$(SED) -n "2,2p" convmv |$(SED) "s/.*convmv \([^ ]*\).*/\1/" > VERSION