[Pkg-ceph-commits] [ceph] 02/04: Run post-build tests:

Sat Nov 1 03:24:31 UTC 2014

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

onlyjob pushed a commit to branch experimental
in repository ceph.

commit 9ddeaf3
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Oct 31 11:36:18 2014

    Run post-build tests:
    
     * Build-Depends:
       + virtualenv
       + valgrind
     * New patches to disable tests that need cluster.
     * Pass "--system-site-packages" to virtualenv to prevent downloads.
---
 debian/clean                                   |  2 +
 debian/control                                 |  3 ++
 debian/patches/series                          |  2 +
 debian/patches/tests-disable-ceph-disk.patch   | 17 ++++++++
 debian/patches/tests-disable.patch             | 56 ++++++++++++++++++++++++++
 debian/patches/virtualenv-never-download.patch | 14 ++++---
 debian/rules                                   |  6 ++-
 7 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/debian/clean b/debian/clean
index fe37bc0..5e83a6d 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,4 @@
 configure
 src/rocksdb/util/build_version.cc
+src/pybind/*.pyc
+src/test/pybind/*.pyc
diff --git a/debian/control b/debian/control
index d1624d1..19ffbb9 100644
--- a/debian/control
+++ b/debian/control
@@ -44,9 +44,12 @@ Build-Depends: debhelper (>= 9~),
                python-nose,
                uuid-dev,
                uuid-runtime,
+               virtualenv,
                xfslibs-dev,
                yasm [amd64],
                zlib1g-dev
+# valgrind is only used in post-build tests, enable on available architectures
+ ,valgrind [amd64 armhf i386 powerpc]
 Build-Conflicts: libcrypto++-dev
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
diff --git a/debian/patches/series b/debian/patches/series
index 6098e34..a15da71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,6 @@ rbdmap3-lazyumount.patch
 arch.patch
 modules.patch
 sample.ceph.conf.patch
+tests-disable.patch
+tests-disable-ceph-disk.patch
 virtualenv-never-download.patch
diff --git a/debian/patches/tests-disable-ceph-disk.patch b/debian/patches/tests-disable-ceph-disk.patch
new file mode 100644
index 0000000..7634140
--- /dev/null
+++ b/debian/patches/tests-disable-ceph-disk.patch
@@ -0,0 +1,17 @@
+Last-Update: 2014-10-31
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+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
+ endif
+ 
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
new file mode 100644
index 0000000..84957ce
--- /dev/null
+++ b/debian/patches/tests-disable.patch
@@ -0,0 +1,56 @@
+Last-Update: 2014-10-31
+Forwarded: no
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+Description: disable tests that depend on network...
+
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -230,8 +230,9 @@
+ 
+ 
+ ## Unit tests
+ 
++if WITH_CLUSTER_TESTS
+ check_SCRIPTS += \
+ 	unittest_bufferlist.sh \
+ 	test/encoding/check-generated.sh \
+ 	test/mon/osd-pool-create.sh \
+@@ -243,8 +244,9 @@
+ 	test/osd/osd-bench.sh \
+ 	test/ceph-disk.sh \
+ 	test/mon/mon-handle-forward.sh \
+ 	test/vstart_wrapped_tests.sh
++endif
+ 
+ EXTRA_DIST += \
+ 	$(srcdir)/test/mon/mon-test-helpers.sh \
+ 	$(srcdir)/test/osd/osd-test-helpers.sh \
+--- a/src/test/erasure-code/Makefile.am
++++ b/src/test/erasure-code/Makefile.am
+@@ -1,6 +1,8 @@
++if WITH_CLUSTER_TESTS
+ check_SCRIPTS += \
+ 	test/erasure-code/test-erasure-code.sh
++endif
+ 
+ ceph_erasure_code_benchmark_SOURCES = \
+ 	erasure-code/ErasureCode.cc \
+ 	test/erasure-code/ceph_erasure_code_benchmark.cc
+--- a/configure.ac
++++ b/configure.ac
+@@ -951,8 +951,15 @@
+ AC_LANG_POP([C++])
+ 
+ AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
+ 
++AC_ARG_WITH([cluster-tests],
++    [AS_HELP_STRING([--with-cluster-tests], [enables cluster tests])],
++    [],
++    [with_cluster_tests=no]
++)
++AM_CONDITIONAL(WITH_CLUSTER_TESTS, [ test "$with_cluster_tests" = "yes" ])
++
+ AM_PATH_PYTHON([2.4],
+ 	[], [AC_MSG_FAILURE([Failed to find Python 2.4 or newer])])
+ 
+ AC_CONFIG_HEADERS([src/acconfig.h])
diff --git a/debian/patches/virtualenv-never-download.patch b/debian/patches/virtualenv-never-download.patch
index b95e96f..3c2b2c5 100644
--- a/debian/patches/virtualenv-never-download.patch
+++ b/debian/patches/virtualenv-never-download.patch
@@ -1,16 +1,18 @@
-Description: Ask virtualenv to never download anything
-Author: Bastian Blank <waldi at debian.org>
-Origin: vendor
+Last-Update: 2014-10-31
 Forwarded: no
----
+Author: Bastian Blank <waldi at debian.org>
+Description: Ask virtualenv to never download anything
+
 --- a/src/test/run-cli-tests
 +++ b/src/test/run-cli-tests
-@@ -30,7 +30,7 @@ if [ ! -e "$CRAM_BIN" ]; then
+@@ -29,9 +29,9 @@
+     # With "make distcheck", the source directory must be read-only. I
      # patched cram to support that. See upstream ticket at
      # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
      # -- tv at inktank.com
 -    virtualenv "$VENV" && $VENV/bin/pip install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
-+    virtualenv --never-download "$VENV" && $VENV/bin/pip install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
++    virtualenv --system-site-packages "$VENV" && $VENV/bin/pip install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
  fi
  
  SRCDIR_ABS="$(readlink -f "$SRCDIR")"
+ BUILDDIR_ABS="$(readlink -f "$BUILDDIR")"
diff --git a/debian/rules b/debian/rules
index a1d1577..36e3dd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,8 @@ endif
 # Use system provided libs3
 extraopts += --with-system-libs3
 
+#extraopts += --with-cluster-tests
+
 %:
 	dh $@ --with javahelper,python2,autoreconf --parallel
 
@@ -58,6 +60,7 @@ override_dh_auto_build:
 	cp -v src/upstart/rbdmap.conf debian/ceph.rbdmap.upstart
 
 override_dh_auto_clean:
+	$(RM) -rv src/test/fake_home src/mkfs src/test-ceph-disk/osd
 	dh_auto_clean --sourcedirectory=src/rocksdb
 	dh_auto_clean
 	rm -fv debian/*.upstart
@@ -109,7 +112,6 @@ override_dh_makeshlibs:
 	dh_makeshlibs -V -X/usr/lib/jni -X/usr/lib/$(DEB_HOST_MULTIARCH)/ceph/erasure-code
 
 override_dh_auto_test:
-	# Skip tests as they rely on virtualenv
-	:
+	-dh_auto_test -v
 
 .PHONY: override_dh_auto_configure override_dh_installinit override_dh_strip override_dh_makeshlibs override_dh_auto_test

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

