#49 - run tests as part of package builds. Ignore failures. Respect D…

…EB_BUILD_OPTIONS=nocheck
mapnik · Oct 3, 2012 · f7a7e45 · f7a7e45
1 parent 741231a
commit f7a7e45
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/debian-nightlies/0.7.x/debian/rules b/debian-nightlies/0.7.x/debian/rules
@@ -15,8 +15,14 @@ else
 	export CFLAGS += -O3
 endif
 
-override_dh_auto_test:
-
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	override_dh_auto_test:
+else:
+	override_dh_auto_test:
+		# the test suite does not 100% pass on all platforms/boost versions,
+		# but the output is useful :)
+		dh_auto_test; echo "Overall Test Exit Code: $?"
+endif
 
 override_dh_auto_configure:
 	scons $(SCONS_FLAGS) CUSTOM_CXXFLAGS="$(CFLAGS)" configure

diff --git a/debian-nightlies/2.0.x/debian/rules b/debian-nightlies/2.0.x/debian/rules
@@ -18,8 +18,14 @@ else
 	export CFLAGS += -O3
 endif
 
-override_dh_auto_test:
-
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	override_dh_auto_test:
+else:
+	override_dh_auto_test:
+		# the test suite does not 100% pass on all platforms/boost versions,
+		# but the output is useful :)
+		dh_auto_test; echo "Overall Test Exit Code: $?"
+endif
 
 override_dh_auto_configure:
 	scons $(SCONS_FLAGS) CUSTOM_CXXFLAGS="$(CFLAGS)" configure

diff --git a/debian-nightlies/2.1.x/debian/rules b/debian-nightlies/2.1.x/debian/rules
@@ -18,8 +18,14 @@ else
 	export CFLAGS += -O3
 endif
 
-override_dh_auto_test:
-
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	override_dh_auto_test:
+else:
+	override_dh_auto_test:
+		# the test suite does not 100% pass on all platforms/boost versions,
+		# but the output is useful :)
+		dh_auto_test; echo "Overall Test Exit Code: $?"
+endif
 
 override_dh_auto_configure:
 	scons $(SCONS_FLAGS) CUSTOM_CXXFLAGS="$(CFLAGS)" configure

diff --git a/debian-nightlies/master/debian/rules b/debian-nightlies/master/debian/rules
@@ -18,8 +18,14 @@ else
 	export CFLAGS += -O3
 endif
 
-override_dh_auto_test:
-
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	override_dh_auto_test:
+else:
+	override_dh_auto_test:
+		# the test suite does not 100% pass on all platforms/boost versions,
+		# but the output is useful :)
+		dh_auto_test; echo "Overall Test Exit Code: $?"
+endif
 
 override_dh_auto_configure:
 	scons $(SCONS_FLAGS) CUSTOM_CXXFLAGS="$(CFLAGS)" configure