equal
deleted
inserted
replaced
|
1 # Patch origin: internal. |
|
2 # Causes test results to be uniform. Will not be submitted upstream. |
|
3 |
|
4 # sed is used rather than a patch to dotests.sh because sorting the output of |
|
5 # every invocation of $CONVMV is a repetitive change, and using a patch would |
|
6 # require that patch to change if the test script ever changed, e.g. to add |
|
7 # additional test cases, whereas this sed line can remain the same. |
|
8 |
|
9 # Also, if a patch were used, it would either have to be applied when the test |
|
10 # target is run, or testsuite.tar would have to be unpacked during prep. |
|
11 |
|
12 # In-place sed (gsed -i) is not used because we want to use a new file name, |
|
13 # so that running the test target repeatedly does not sed an already sed'ed |
|
14 # file. |
|
15 |
|
16 --- Makefile Mon Feb 23 14:51:24 2015 |
|
17 +++ Makefile Mon Feb 23 14:50:47 2015 |
|
18 @@ -22,7 +22,9 @@ |
|
19 |
|
20 test: |
|
21 test -d suite || $(TAR) xf testsuite.tar |
|
22 - cd suite ; ./dotests.sh |
|
23 + $(SED) -e 's/\($$CONVMV.*\)$$/& 2>\&1 | LC_ALL='C' $$SORT/' < suite/dotests.sh > suite/dotests-deterministic.sh |
|
24 + chmod +x suite/dotests-deterministic.sh |
|
25 + cd suite ; ./dotests-deterministic.sh |
|
26 |
|
27 dist: clean |
|
28 $(SED) -n "2,2p" convmv |$(SED) "s/.*convmv \([^ ]*\).*/\1/" > VERSION |