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