Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gutenprint/patches/tests-env.patch
author Petr Cvachoucek <petr.cvachoucek@oracle.com>
Thu, 16 Feb 2012 09:29:52 -0800
changeset 693 15d71a1e47d6
child 2224 f7669e0b3220
permissions -rw-r--r--
6948608 Update Gutenprint to version 5.2.7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
693
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     1
 
diff -Naur gutenprint-5.2.7-orig/src/cups/Makefile.am gutenprint-5.2.7/src/cups/Makefile.am
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     2
 
--- gutenprint-5.2.7-orig/src/cups/Makefile.am	2011-01-18 00:20:51.000000000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     3
 
+++ gutenprint-5.2.7/src/cups/Makefile.am	2012-02-09 09:21:22.493187000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     4
 
@@ -77,6 +77,7 @@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     5
 
 sbin_SCRIPTS = cups-genppdupdate
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     6
 
 cupsexec_filter_PROGRAMS = rastertogutenprint.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ commandtoepson commandtocanon
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     7
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     8
 
+TESTS_ENVIRONMENT= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
     9
 
 TESTS= test-ppds test-rastertogutenprint
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    10
 
 noinst_SCRIPTS=test-rastertogutenprint
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    11
 
 endif
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    12
 
diff -Naur gutenprint-5.2.7-orig/src/cups/Makefile.in gutenprint-5.2.7/src/cups/Makefile.in
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    13
 
--- gutenprint-5.2.7-orig/src/cups/Makefile.in	2011-05-02 03:32:20.000000000 +0200
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    14
 
+++ gutenprint-5.2.7/src/cups/Makefile.in	2012-02-09 09:22:53.311217000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    15
 
@@ -399,6 +399,7 @@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    16
 
 @BUILD_TRANSLATED_CUPS_PPDS_TRUE@TRANSLATE_PPDS = -DCUPS_TRANSLATED_PPDS
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    17
 
 @BUILD_SIMPLIFIED_CUPS_PPDS_TRUE@BUILD_SIMPLE_PPDS = -DGENERATE_SIMPLIFIED_PPDS
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    18
 
 @BUILD_CUPS_TRUE@sbin_SCRIPTS = cups-genppdupdate
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    19
 
+@BUILD_CUPS_TRUE@TESTS_ENVIRONMENT= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    20
 
 @BUILD_CUPS_TRUE@TESTS = test-ppds test-rastertogutenprint
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    21
 
 @BUILD_CUPS_TRUE@noinst_SCRIPTS = test-rastertogutenprint
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    22
 
 @BUILD_GENPPD_STATIC_TRUE@STATIC_LDOPTS = -static -export-dynamic
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    23
 
diff -Naur gutenprint-5.2.7-orig/src/cups/test-ppds gutenprint-5.2.7/src/cups/test-ppds
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    24
 
--- gutenprint-5.2.7-orig/src/cups/test-ppds	2011-01-17 23:53:05.000000000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    25
 
+++ gutenprint-5.2.7/src/cups/test-ppds	2012-02-09 11:01:07.638462000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    26
 
@@ -8,7 +8,7 @@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    27
 
 # Also, a number of our media sizes aren't named correctly, but we'll
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    28
 
 # accept those issues rather than cluttering the namespace further and/or
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    29
 
 # changing tag names.
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    30
 
-cupstestppdopts='-I profiles -W sizes'
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    31
 
+cupstestppdopts='-I profiles -W sizes -W translations'
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    32
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    33
 
 ppd_count=`find ppd \( -name '*.ppd.gz' -o -name '*.ppd' \) -print | wc -l`
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    34
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    35
 
diff -Naur gutenprint-5.2.7-orig/src/testpattern/Makefile.am gutenprint-5.2.7/src/testpattern/Makefile.am
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    36
 
--- gutenprint-5.2.7-orig/src/testpattern/Makefile.am	2007-12-08 19:41:56.000000000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    37
 
+++ gutenprint-5.2.7/src/testpattern/Makefile.am	2012-02-09 09:21:51.525890000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    38
 
@@ -26,6 +26,7 @@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    39
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    40
 
 pkgdatadir = $(datadir)/$(PACKAGE)/samples
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    41
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    42
 
+TESTS_ENVIRONMENT= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    43
 
 TESTS = run-testpattern-1 run-testpattern-2
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    44
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    45
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    46
 
diff -Naur gutenprint-5.2.7-orig/src/testpattern/Makefile.in gutenprint-5.2.7/src/testpattern/Makefile.in
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    47
 
--- gutenprint-5.2.7-orig/src/testpattern/Makefile.in	2011-05-02 03:32:20.000000000 +0200
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    48
 
+++ gutenprint-5.2.7/src/testpattern/Makefile.in	2012-02-09 09:23:19.496457000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    49
 
@@ -339,6 +339,7 @@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    50
 
 top_srcdir = @top_srcdir@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    51
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    52
 
 GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    53
 
+TESTS_ENVIRONMENT= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    54
 
 TESTS = run-testpattern-1 run-testpattern-2
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    55
 
 @BUILD_TESTPATTERN_TRUE@noinst_SCRIPTS = run-testpattern-2
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    56
 
 AM_LFLAGS = -i
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    57
 
diff -Naur gutenprint-5.2.7-orig/test/Makefile.am gutenprint-5.2.7/test/Makefile.am
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    58
 
--- gutenprint-5.2.7-orig/test/Makefile.am	2008-05-31 03:56:45.000000000 +0200
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    59
 
+++ gutenprint-5.2.7/test/Makefile.am	2012-02-09 09:22:05.458655000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    60
 
@@ -26,6 +26,7 @@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    61
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    62
 
 LOCAL_CPPFLAGS = -I$(top_srcdir)/src/main $(GUTENPRINT_CFLAGS)
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    63
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    64
 
+TESTS_ENVIRONMENT= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    65
 
 TESTS = curve run-testdither run-weavetest
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    66
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    67
 
 ## Programs
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    68
 
diff -Naur gutenprint-5.2.7-orig/test/Makefile.in gutenprint-5.2.7/test/Makefile.in
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    69
 
--- gutenprint-5.2.7-orig/test/Makefile.in	2011-05-02 03:32:21.000000000 +0200
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    70
 
+++ gutenprint-5.2.7/test/Makefile.in	2012-02-09 09:23:39.619567000 +0100
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    71
 
@@ -41,6 +41,7 @@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    72
 
 host_triplet = @host@
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    73
 
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    74
 
 	$(top_srcdir)/scripts/global.mk
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    75
 
+TESTS_ENVIRONMENT= STP_MODULE_PATH=$(top_builddir)/src/main/.libs:$(top_builddir)/src/main STP_DATA_PATH=$(top_srcdir)/src/xml
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    76
 
 TESTS = curve$(EXEEXT) run-testdither run-weavetest
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    77
 
 @BUILD_TEST_TRUE@noinst_PROGRAMS = testdither$(EXEEXT) \
15d71a1e47d6 6948608 Update Gutenprint to version 5.2.7
Petr Cvachoucek <petr.cvachoucek@oracle.com>
parents:
diff changeset 
    78
 
 @BUILD_TEST_TRUE@	escp2-weavetest$(EXEEXT) unprint$(EXEEXT) \
upstream/oracle/userland-gate