[SCM] Apache ZooKeeper branch, master, updated. debian/3.4.5+dfsg-1-4-g8058472

[James Page]

The following commit has been merged in the master branch:
commit 805847241cd755f0732f887026a211cf270bd5ae
Author: James Page <james.page at ubuntu.com>
Date:   Mon Feb 25 13:19:27 2013 +0000

    d/rules: Disable native tests on Ubuntu due to incompatibility in test framework with glibc 2.17.

diff --git a/debian/changelog b/debian/changelog
index ad90bc0..ee8c767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ zookeeper (3.4.5+dfsg-1~exp1) experimental; urgency=low
       on others.
   * d/rules,zookeeperd.upstart: Rejig now that debhelper in Debian and
     Ubuntu does the right things with init and upstart configs.
+  * d/rules: Disable native tests on Ubuntu due to incompatibility in
+    test framework with glibc 2.17.
 
  -- James Page <james.page at ubuntu.com>  Thu, 07 Feb 2013 10:48:31 +0000
 
diff --git a/debian/rules b/debian/rules
index 66340ff..4ea23a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,8 +66,11 @@ override_dh_auto_test-arch:
 		ln -sf /usr/share/java/$$jar.jar build/lib/$$jar.jar; \
 	done;
 	# Execute multi-threaded test suite
-	$(MAKE) -C src/c zktest-mt
-	cd src/c && ./zktest-mt
+	# Disable on Ubuntu due to glibc 2.17 incompatibility
+	if ! dpkg-vendor --derives-from ubuntu; then \
+		$(MAKE) -C src/c zktest-mt; \
+		cd src/c && ./zktest-mt; \
+	fi;
 endif
 # Only run core Java unit tests on i386 architecture as this is the arch
 # that they are built and published on - works around -indep not working

-- 
Apache ZooKeeper