|
1 Allows to produce clean test run even when XSLT is configured outside of |
|
2 source directory. |
|
3 |
|
4 --- libxslt-1.1.27/tests/plugins/Makefile.am Tue Sep 4 07:26:23 2012 |
|
5 +++ libxslt-1.1.27/tests/plugins/Makefile.am Thu Oct 11 06:25:06 2012 |
|
6 @@ -29,8 +29,8 @@ |
|
7 test tests: $(top_builddir)/xsltproc/xsltproc test-logall $(noinst_LTLIBRARIES) |
|
8 @LD_LIBRARY_PATH=$(plugindir):$(top_builddir)/libxslt/.libs:$(LD_LIBRARY_PATH) \ |
|
9 LIBXSLT_PLUGINS_PATH=$(plugindir) \ |
|
10 - $(top_builddir)/xsltproc/xsltproc plugin.xsl plugin.xml > plugin.res |
|
11 - @diff plugin.out plugin.res |
|
12 + $(top_builddir)/xsltproc/xsltproc $(srcdir)/plugin.xsl $(srcdir)/plugin.xml > plugin.res |
|
13 + @diff $(srcdir)/plugin.out plugin.res |
|
14 @rm plugin.res |
|
15 |
|
16 else |
|
17 --- libxslt-1.1.27/tests/documents/Makefile.am Tue Sep 4 07:26:23 2012 |
|
18 +++ libxslt-1.1.27/tests/documents/Makefile.am Thu Oct 11 06:54:44 2012 |
|
19 @@ -27,6 +27,7 @@ |
|
20 grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ |
|
21 rm -f result) |
|
22 @($(CHECKER) $(top_builddir)/xsltproc/xsltproc $(srcdir)/test.xsl $(srcdir)/test_bad.xml > result 2>err ; \ |
|
23 + sed 's|$(srcdir)/||' err > err.tmp; mv err.tmp err; \ |
|
24 diff $(srcdir)/test_bad.result result; \ |
|
25 diff $(srcdir)/test_bad.err err; \ |
|
26 grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ |
|
27 --- libxslt-1.1.27/tests/general/Makefile.am Fri Sep 7 00:49:41 2012 |
|
28 +++ libxslt-1.1.27/tests/general/Makefile.am Mon Oct 15 02:41:07 2012 |
|
29 @@ -207,10 +207,11 @@ |
|
30 if [ ! -f $$j ] ; then continue ; fi ; \ |
|
31 if [ -d $$j ] ; then continue ; fi ; \ |
|
32 name=`basename $$j .xsl`; \ |
|
33 + real_docs_path=`cd $(srcdir)/../docs && pwd`; \ |
|
34 out=$(srcdir)/"$$name".out; \ |
|
35 err=$(srcdir)/"$$name".err; \ |
|
36 log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc $$j $$i \ |
|
37 - > result.$$name 2>err.$$name; \ |
|
38 + 2>&1 > result.$$name | sed 's|$(srcdir)|.|' >err.$$name; \ |
|
39 if [ ! -f $$out ] ; then \ |
|
40 cp result.$$name $$out ; \ |
|
41 if [ -s err.$$name ] ; then \ |
|
42 @@ -217,6 +218,9 @@ |
|
43 cp err.$$name $$err ; \ |
|
44 fi ; \ |
|
45 else \ |
|
46 + grep '../docs/' $$out >/dev/null && \ |
|
47 + sed "s|$$real_docs_path|../docs|" result.$$name > \ |
|
48 + result.$$name.tmp && mv result.$$name.tmp result.$$name; \ |
|
49 diff $$out result.$$name; \ |
|
50 if [ -s $$err ] ; then \ |
|
51 diff $$err err.$$name; \ |
|
52 @@ -239,10 +243,11 @@ |
|
53 if [ ! -f $$j ] ; then continue ; fi ; \ |
|
54 if [ -d $$j ] ; then continue ; fi ; \ |
|
55 name=`basename $$j .xsl`; \ |
|
56 + real_docs_path=`cd $(srcdir)/../docs && pwd`; \ |
|
57 out=$(srcdir)/"$$name".out; \ |
|
58 err=$(srcdir)/"$$name".err; \ |
|
59 log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict $$j $$i \ |
|
60 - > result.$$name 2>err.$$name; \ |
|
61 + 2>&1 > result.$$name | sed 's|$(srcdir)|.|' >err.$$name; \ |
|
62 if [ ! -f $$out ] ; then \ |
|
63 cp result.$$name $$out ; \ |
|
64 if [ -s err.$$name ] ; then \ |
|
65 @@ -249,6 +254,9 @@ |
|
66 cp err.$$name $$err ; \ |
|
67 fi ; \ |
|
68 else \ |
|
69 + grep '../docs/' $$out >/dev/null && \ |
|
70 + sed "s|$$real_docs_path|../docs|" result.$$name > \ |
|
71 + result.$$name.tmp && mv result.$$name.tmp result.$$name; \ |
|
72 diff $$out result.$$name; \ |
|
73 if [ -s $$err ] ; then \ |
|
74 diff $$err err.$$name; \ |
|
75 --- libxslt-1.1.27/tests/REC/Makefile.am Fri Sep 7 00:49:41 2012 |
|
76 +++ libxslt-1.1.27/tests/REC/Makefile.am Thu Oct 11 08:04:48 2012 |
|
77 @@ -96,7 +96,7 @@ |
|
78 fi ; \ |
|
79 log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \ |
|
80 $(srcdir)/$$name.xsl $(srcdir)/$$name.xml \ |
|
81 - > $$name.res 2>$$name.bad ; \ |
|
82 + 2>&1 > $$name.res | sed 's|$(srcdir)|.|' >$$name.bad ; \ |
|
83 if [ ! -f $(srcdir)/$$name.out ] ; then \ |
|
84 cp $$name.res $(srcdir)/$$name.out ; \ |
|
85 if [ -s $$name.bad ] ; then \ |
|
86 @@ -158,7 +158,7 @@ |
|
87 fi ; \ |
|
88 log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc --nodict \ |
|
89 $(srcdir)/$$name.xsl $(srcdir)/$$name.xml \ |
|
90 - > $$name.res 2>$$name.bad ; \ |
|
91 + 2>&1 > $$name.res | sed 's|$(srcdir)|.|' >$$name.bad ; \ |
|
92 if [ ! -f $(srcdir)/$$name.out ] ; then \ |
|
93 cp $$name.res $(srcdir)/$$name.out ; \ |
|
94 if [ -s $$name.bad ] ; then \ |