From 6e08a00f4f6cb1183f615e626a7297945ac53783 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Aug 2011 14:49:03 +0200 Subject: * test/* - reorganize the various testcases and helper we have and integrate them better into the buildsystem - run the test/libapt testcases at package build-time --- debian/changelog | 6 +++++- debian/rules | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 07276ef61..69e0c0e2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,12 @@ apt (0.8.15.7) UNRELEASED; urgency=low - ignore "self"-conflicts for all architectures of a package instead of just for the architecture of the package locked at in the ordering of installations too (Closes: #802901) + * test/* + - reorganize the various testcases and helper we have and + integrate them better into the buildsystem + - run the test/libapt testcases at package build-time - -- David Kalnischkies Wed, 17 Aug 2011 11:08:02 +0200 + -- David Kalnischkies Wed, 17 Aug 2011 14:48:32 +0200 apt (0.8.15.6) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 640900678..541660cfe 100755 --- a/debian/rules +++ b/debian/rules @@ -97,6 +97,7 @@ build/configure-stamp: configure build/build-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary + $(MAKE) test touch $@ build/build-doc-stamp: build/configure-stamp -- cgit v1.2.3-70-g09d2 From 1908ba0f52399bda2f97dbff099d03be2237d03f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Aug 2011 15:09:57 +0200 Subject: * debian/apt.symbols: - add the newly added symbols since 0.8.15.3 --- debian/apt.symbols | 7 ++++++- debian/changelog | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/apt.symbols b/debian/apt.symbols index 932fb1411..7eaf61e50 100644 --- a/debian/apt.symbols +++ b/debian/apt.symbols @@ -563,7 +563,6 @@ libapt-pkg.so.4.10 libapt-pkg4.10 (c++)"pkgCacheGenerator::ListParser::NewProvides(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 (c++)"pkgCacheGenerator::ListParser::CollectFileProvides(pkgCache&, pkgCache::VerIterator&)@Base" 0.8.0 (c++)"pkgCacheGenerator::ListParser::~ListParser()@Base" 0.8.0 - (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned int const&, unsigned int const&, unsigned int*)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewFileVer(pkgCache::VerIterator&, pkgCacheGenerator::ListParser&)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewPackage(pkgCache::PkgIterator&, std::basic_string, std::allocator > const&, std::basic_string, std::allocator > const&)@Base" 0.8.0 (c++)"pkgCacheGenerator::NewVersion(pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned long)@Base" 0.8.0 @@ -1327,3 +1326,9 @@ libapt-pkg.so.4.10 libapt-pkg4.10 (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2 1 (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1 1 (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1 1 + (c++)"Configuration::CndSet(char const*, int)@Base" 0.8.15.3 1 + (c++)"pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator)@Base" 0.8.15.3 1 + (c++)"DeEscapeString(std::basic_string, std::allocator > const&)@Base" 0.8.15.4 1 + (c++)"GetModificationTime(std::basic_string, std::allocator > const&)@Base" 0.8.15.6 1 + (c++)"pkgSourceList::GetLastModifiedTime()@Base" 0.8.15.6 1 + (c++)"pkgCacheGenerator::NewDepends(pkgCache::PkgIterator&, pkgCache::VerIterator&, std::basic_string, std::allocator > const&, unsigned int const&, unsigned int const&, unsigned int*&)@Base" 0.8.15.6 1 diff --git a/debian/changelog b/debian/changelog index 69e0c0e2e..56d4c7e0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ apt (0.8.15.7) UNRELEASED; urgency=low - reorganize the various testcases and helper we have and integrate them better into the buildsystem - run the test/libapt testcases at package build-time + * debian/apt.symbols: + - add the newly added symbols since 0.8.15.3 - -- David Kalnischkies Wed, 17 Aug 2011 14:48:32 +0200 + -- David Kalnischkies Wed, 17 Aug 2011 15:09:16 +0200 apt (0.8.15.6) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 224bdefc223703884918235819fe3b246e568f74 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 17 Aug 2011 15:14:45 +0200 Subject: understand DEB_BUILD_OPTIONS nocheck to disable the testexecution --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 541660cfe..d6c2dfa22 100755 --- a/debian/rules +++ b/debian/rules @@ -97,7 +97,11 @@ build/configure-stamp: configure build/build-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) $(MAKE) test +else + @echo "Tests DISABLED" +endif touch $@ build/build-doc-stamp: build/configure-stamp -- cgit v1.2.3-70-g09d2