[xmltooling] 11/17: New patch Don-t-install-the-test-program-but-link-correctly-an.patch
Ferenc Wágner
wferi-guest at moszumanska.debian.org
Thu Jul 21 18:17:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi-guest pushed a commit to branch debian/experimental
in repository xmltooling.
commit 09bad450a8409b09df82660d98167170062e5280
Author: Ferenc Wágner <wferi at niif.hu>
Date: Wed Jul 6 15:37:15 2016 +0200
New patch Don-t-install-the-test-program-but-link-correctly-an.patch
Don't install the test program, but link correctly and run it
---
...ll-the-test-program-but-link-correctly-an.patch | 41 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 42 insertions(+)
diff --git a/debian/patches/Don-t-install-the-test-program-but-link-correctly-an.patch b/debian/patches/Don-t-install-the-test-program-but-link-correctly-an.patch
new file mode 100644
index 0000000..ff33782
--- /dev/null
+++ b/debian/patches/Don-t-install-the-test-program-but-link-correctly-an.patch
@@ -0,0 +1,41 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Wed, 6 Jul 2016 16:51:20 +0200
+Subject: Don't install the test program, but link correctly and run it
+
+---
+ xmltoolingtest/Makefile.am | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
+index 779e808..7b58b5a 100644
+--- a/xmltoolingtest/Makefile.am
++++ b/xmltoolingtest/Makefile.am
+@@ -2,20 +2,19 @@ AUTOMAKE_OPTIONS = foreign
+
+ if BUILD_UNITTEST
+
+-bin_PROGRAMS = xmltoolingtest
++TESTS = xmltoolingtest
++
++check_PROGRAMS = xmltoolingtest
++
+ xmltoolingtest_CXXFLAGS = $(CXXTESTFLAGS)
++xmltoolingtest_CPPFLAGS = $(xerces_CFLAGS)
+ if BUILD_XMLSEC
+-xmltoolingtest_CPPFLAGS = $(xerces_CFLAGS) $(XMLSEC_CFLAGS)
+-xmltoolingtest_LDFLAGS = $(xerces_LIBS) $(XMLSEC_LIBS)
+-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la
++xmltoolingtest_CPPFLAGS += $(XMLSEC_CFLAGS)
++xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la $(XMLSEC_LIBS) $(xerces_LIBS)
+ else
+-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la
++xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la $(xerces_LIBS)
+ endif
+
+-else
+-
+-bin_PROGRAMS =
+-
+ endif
+
+ if BUILD_XMLSEC
diff --git a/debian/patches/series b/debian/patches/series
index 921d855..140d7e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ Make-pkgxmldir-configurable.patch
Finish-separating-flags-use-_LIBADD.patch
Add-more-forgotten-test-result-prints.patch
Remove-.pl-extension-of-cxxtestgen.patch
+Don-t-install-the-test-program-but-link-correctly-an.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git
More information about the Pkg-shibboleth-devel
mailing list