From d538205f3cfe7cc2333f946fa86a76e004441219 Mon Sep 17 00:00:00 2001 From: Russell Sim Date: Thu, 13 Feb 2014 09:35:58 +1100 Subject: [PATCH] Disable simple blame test This simple blame test depends on the libgit2 repo which isn't shipped in the orig tarball. --- debian/changelog | 3 +++ ...{disable_online_tests.patch => disable_tests.patch} | 10 ++++++++-- debian/patches/series | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) rename debian/patches/{disable_online_tests.patch => disable_tests.patch} (53%) diff --git a/debian/changelog b/debian/changelog index 1335099f1..4890651bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ libgit2 (0.20.0-1) UNRELEASED; urgency=medium * New upstream release 0.20.0. + * debian/patches/disable_online_tests.patch: Renamed to + disable_tests.patch. + * debian/patches/disable_tests.patch: Disabled blame test. -- Russell Sim Thu, 13 Feb 2014 09:17:02 +1100 diff --git a/debian/patches/disable_online_tests.patch b/debian/patches/disable_tests.patch similarity index 53% rename from debian/patches/disable_online_tests.patch rename to debian/patches/disable_tests.patch index 35a3513e9..3fd3388b3 100644 --- a/debian/patches/disable_online_tests.patch +++ b/debian/patches/disable_tests.patch @@ -1,4 +1,10 @@ -Disable online tests. +Disable incompatible tests + +online - disable online tests. + +blame::simple::trivial_libgit2 - requires the libgit2 directory to be +a repository + diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bd25aa..f44190e 100644 --- a/CMakeLists.txt @@ -8,7 +14,7 @@ index 6bd25aa..f44190e 100644 ENABLE_TESTING() - ADD_TEST(libgit2_clar libgit2_clar -ionline) -+ ADD_TEST(libgit2_clar libgit2_clar -xonline) ++ ADD_TEST(libgit2_clar libgit2_clar -xonline -xblame::simple::trivial_libgit2) ENDIF () IF (TAGS) diff --git a/debian/patches/series b/debian/patches/series index f582fa5af..cdacb994b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -disable_online_tests.patch +disable_tests.patch