[Pkg-ceph-commits] [ceph] 02/02: Restore patches for test enablement.

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch experimental
in repository ceph.

commit f4f98ec30620f5f797e7986caf03244f209b36ba
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jul 9 11:33:50 2015 +0100

    Restore patches for test enablement.
---
 debian/patches/series                        |  3 +++
 debian/patches/tests-disable-ceph-disk.patch | 15 +++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 78b392d..9f24fbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,9 @@ sample.ceph.conf.patch
 # Disabled until adopted upstream
 # use_system_jerasure.patch
 virtualenv-never-download.patch
+# Testing patches
+tests-disable-ceph-disk.patch
+tests-disable.patch
 
 ## From Ubuntu
 ceph-osd-prestart-path.patch
diff --git a/debian/patches/tests-disable-ceph-disk.patch b/debian/patches/tests-disable-ceph-disk.patch
index 7634140..200407c 100644
--- a/debian/patches/tests-disable-ceph-disk.patch
+++ b/debian/patches/tests-disable-ceph-disk.patch
@@ -5,13 +5,12 @@ Description: disable (FS-dependent?) "ceph-disk" test which always seems to fail
 
 --- a/src/test/Makefile.am
 +++ b/src/test/Makefile.am
-@@ -241,9 +241,8 @@
- 	test/mon/osd-erasure-code-profile.sh \
- 	test/mon/mkfs.sh \
- 	test/osd/osd-config.sh \
- 	test/osd/osd-bench.sh \
--	test/ceph-disk.sh \
- 	test/mon/mon-handle-forward.sh \
- 	test/vstart_wrapped_tests.sh
+@@ -83,8 +83,6 @@ check_SCRIPTS += \
+ 
+ if ENABLE_ROOT_MAKE_CHECK
+ check_SCRIPTS += test/ceph-disk-root.sh
+-else
+-check_SCRIPTS += test/ceph-disk.sh
  endif
  
+ EXTRA_DIST += \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git