[cppunit] 10/38: Import Debian changes 1.10.2-5
Rene Engelhard
rene at moszumanska.debian.org
Sun May 14 10:57:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch experimental
in repository cppunit.
commit 2c2a1479ac4f7863985b61478227944fa17bff20
Author: Steve M. Robbins <smr at debian.org>
Date: Tue Nov 22 22:12:05 2005 -0500
Import Debian changes 1.10.2-5
cppunit (1.10.2-5) unstable; urgency=low
* src/cppunit/Makefile.am: Link libcppunit with -ldl (thanks, Aurelien
Jarno). Add test case to check linking. Closes: #338252.
* debian/rules: Run "make check" as part of build.
* examples/hierarchy/ChessTest.h: Qualify access to base-class variable
m_game with "this->".
* debian/control: Rename library packages to use "c2a" suffix, due to
libstdc++ allocator change. Declare conflicts & replaces with the
previous "c2" packages. Closes: #339158.
---
debian/changelog | 16 +++++
debian/control | 16 ++---
debian/rules | 9 ++-
examples/hierarchy/ChessTest.h | 2 +-
src/cppunit/Makefile.am | 9 ++-
src/cppunit/Makefile.in | 133 +++++++++++++++++++++++++++++++++++------
src/cppunit/t_link.cpp | 8 +++
7 files changed, 159 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1b2d988..2912a6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+cppunit (1.10.2-5) unstable; urgency=low
+
+ * src/cppunit/Makefile.am: Link libcppunit with -ldl (thanks, Aurelien
+ Jarno). Add test case to check linking. Closes: #338252.
+
+ * debian/rules: Run "make check" as part of build.
+
+ * examples/hierarchy/ChessTest.h: Qualify access to base-class variable
+ m_game with "this->".
+
+ * debian/control: Rename library packages to use "c2a" suffix, due to
+ libstdc++ allocator change. Declare conflicts & replaces with the
+ previous "c2" packages. Closes: #339158.
+
+ -- Steve M. Robbins <smr at debian.org> Tue, 22 Nov 2005 22:12:05 -0500
+
cppunit (1.10.2-4) unstable; urgency=low
* GCC 4 transition. Closes: #322557.
diff --git a/debian/control b/debian/control
index 870736a..ff3be60 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,11 @@ Maintainer: Steve M. Robbins <smr at debian.org>
Build-Depends: libqt3-mt-dev, libqt3-compat-headers, debhelper (>> 4), doxygen
Standards-Version: 3.5.2
-Package: libcppunit-1.10-2c2
+Package: libcppunit-1.10-2c2a
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libcppunit-1.10-0 (= 1.10.2-1), libcppunit-1.10-2
-Replaces: libcppunit-1.10-0 (= 1.10.2-1), libcppunit-1.10-2
+Conflicts: libcppunit-1.10-0 (= 1.10.2-1), libcppunit-1.10-2, libcppunit-1.10-2c2
+Replaces: libcppunit-1.10-0 (= 1.10.2-1), libcppunit-1.10-2, libcppunit-1.10-2c2
Description: Unit Testing Library for C++
CppUnit is a simple Framework for incorporating test cases in
your C++ code. It is similar to, and inspired by, xUnit and
@@ -18,11 +18,11 @@ Description: Unit Testing Library for C++
For more information on CppUnit visit the project homepage
http://cppunit.sourceforge.net/ .
-Package: libqttestrunner1c2
+Package: libqttestrunner1c2a
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libqttestrunner1
-Replaces: libqttestrunner1
+Conflicts: libqttestrunner1, libqttestrunner1c2
+Replaces: libqttestrunner1, libqttestrunner1c2
Description: Unit Testing Library for C++
CppUnit is a simple Framework for incorporating test cases in
your C++ code. It is similar to, and inspired by, xUnit and
@@ -35,8 +35,8 @@ Description: Unit Testing Library for C++
Package: libcppunit-dev
Architecture: any
-Depends: libcppunit-1.10-2c2 (= ${Source-Version}), ${shlibs:Depends}
-Suggests: libqttestrunner1c2 (= ${Source-Version})
+Depends: libcppunit-1.10-2c2a (= ${Source-Version}), ${shlibs:Depends}
+Suggests: libqttestrunner1c2a (= ${Source-Version})
Replaces: cppunit (<< 1.10.0-3)
Description: Unit Testing Library for C++
CppUnit is a simple Framework for incorporating test cases in
diff --git a/debian/rules b/debian/rules
index 04c745b..b055938 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,13 @@ build-stamp:
dh_testdir
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
-# With GCC 2, typeid() was worse than useless so I disabled it.
-# Reportedly, it is now useful with GCC 3.
-# --disable-typeinfo-name
$(MAKE)
cd src/qttestrunner && qmake qttestrunner.pro
$(MAKE) -C src/qttestrunner
+ $(MAKE) check
+
touch build-stamp
clean:
@@ -49,10 +48,10 @@ install: build
install
# Runtime library package
- dh_install -plibcppunit-1.10-2c2 --autodest debian/tmp/usr/lib/lib*.so.*
+ dh_install -plibcppunit-1.10-2c2a --autodest debian/tmp/usr/lib/lib*.so.*
# Qt Test runner library package
- dh_install -plibqttestrunner1c2 lib/lib*.so.* usr/lib
+ dh_install -plibqttestrunner1c2a lib/lib*.so.* usr/lib
# Developer package
dh_install -plibcppunit-dev --autodest debian/tmp/usr/bin/DllPlugInTester
diff --git a/examples/hierarchy/ChessTest.h b/examples/hierarchy/ChessTest.h
index eda6c5e..8e70c1a 100644
--- a/examples/hierarchy/ChessTest.h
+++ b/examples/hierarchy/ChessTest.h
@@ -16,7 +16,7 @@ public:
void testNumberOfPieces()
{
- CPPUNIT_ASSERT( m_game->getNumberOfPieces () == 32 );
+ CPPUNIT_ASSERT( this->m_game->getNumberOfPieces () == 32 );
}
};
diff --git a/src/cppunit/Makefile.am b/src/cppunit/Makefile.am
index 66d8de1..4185f7e 100644
--- a/src/cppunit/Makefile.am
+++ b/src/cppunit/Makefile.am
@@ -63,5 +63,12 @@ libcppunit_la_SOURCES = \
libcppunit_la_LDFLAGS= \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE)
+ -release $(LT_RELEASE) \
+ @LIBADD_DL@
+TESTS = t_link
+
+check_PROGRAMS = t_link
+
+t_link_SOURCES = t_link.cpp
+t_link_LDADD = libcppunit.la
diff --git a/src/cppunit/Makefile.in b/src/cppunit/Makefile.in
index 973d256..1c4d3f9 100644
--- a/src/cppunit/Makefile.in
+++ b/src/cppunit/Makefile.in
@@ -18,7 +18,7 @@
# $Id: Makefile.am,v 1.43 2003/05/07 20:07:17 blep Exp $
#
-SOURCES = $(libcppunit_la_SOURCES)
+SOURCES = $(libcppunit_la_SOURCES) $(t_link_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -41,6 +41,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+check_PROGRAMS = t_link$(EXEEXT)
subdir = src/cppunit
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -83,6 +84,9 @@ am_libcppunit_la_OBJECTS = AdditionalMessage.lo Asserter.lo \
XmlDocument.lo XmlElement.lo XmlOutputter.lo \
XmlOutputterHook.lo Win32DynamicLibraryManager.lo
libcppunit_la_OBJECTS = $(am_libcppunit_la_OBJECTS)
+am_t_link_OBJECTS = t_link.$(OBJEXT)
+t_link_OBJECTS = $(am_t_link_OBJECTS)
+t_link_DEPENDENCIES = libcppunit.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -131,7 +135,8 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/XmlDocument.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/XmlElement.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/XmlOutputter.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/XmlOutputterHook.Plo
+ at AMDEP_TRUE@ ./$(DEPDIR)/XmlOutputterHook.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/t_link.Po
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
@@ -148,8 +153,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libcppunit_la_SOURCES)
-DIST_SOURCES = $(libcppunit_la_SOURCES)
+SOURCES = $(libcppunit_la_SOURCES) $(t_link_SOURCES)
+DIST_SOURCES = $(libcppunit_la_SOURCES) $(t_link_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -324,8 +329,12 @@ libcppunit_la_SOURCES = \
libcppunit_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE)
+ -release $(LT_RELEASE) \
+ @LIBADD_DL@
+TESTS = t_link
+t_link_SOURCES = t_link.cpp
+t_link_LDADD = libcppunit.la
all: all-am
.SUFFIXES:
@@ -389,6 +398,16 @@ clean-libLTLIBRARIES:
libcppunit.la: $(libcppunit_la_OBJECTS) $(libcppunit_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libcppunit_la_LDFLAGS) $(libcppunit_la_OBJECTS) $(libcppunit_la_LIBADD) $(LIBS)
+clean-checkPROGRAMS:
+ @list='$(check_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
+t_link$(EXEEXT): $(t_link_OBJECTS) $(t_link_DEPENDENCIES)
+ @rm -f t_link$(EXEEXT)
+ $(CXXLINK) $(t_link_LDFLAGS) $(t_link_OBJECTS) $(t_link_LDADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -444,6 +463,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XmlElement.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XmlOutputter.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XmlOutputterHook.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/t_link.Po at am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -527,6 +547,79 @@ GTAGS:
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+ ;; \
+ *) \
+ echo "PASS: $$tst"; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ echo "FAIL: $$tst"; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+ echo "SKIP: $$tst"; \
+ fi; \
+ done; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="All $$all tests passed"; \
+ else \
+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all tests failed"; \
+ else \
+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+ skipped="($$skip tests were not run)"; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+ report=""; \
+ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+ report="Please report to $(PACKAGE_BUGREPORT)"; \
+ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+ test -z "$$skipped" || echo "$$skipped"; \
+ test -z "$$report" || echo "$$report"; \
+ echo "$$dashes"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -555,6 +648,8 @@ distdir: $(DISTFILES)
fi; \
done
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
all-am: Makefile $(LTLIBRARIES)
installdirs:
@@ -587,8 +682,8 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
- mostlyclean-am
+clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+ clean-libtool mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -636,18 +731,18 @@ ps-am:
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-libLTLIBRARIES
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+ clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-libLTLIBRARIES \
+ install-man install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/cppunit/t_link.cpp b/src/cppunit/t_link.cpp
new file mode 100644
index 0000000..c3c7dcb
--- /dev/null
+++ b/src/cppunit/t_link.cpp
@@ -0,0 +1,8 @@
+/* This program simply tests that we can link against
+ * libcppunit.
+ */
+
+int main( int ac, char* av[] )
+{
+ return 0;
+}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/cppunit.git
More information about the Pkg-openoffice-commits
mailing list