X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=4a02a49e5c4539c8d66963ca2e338fcd6994f880;hb=7fa710e43fdf2dbf7fe41877cf73e04ccc4a7166;hp=b1f9065ce151bd3a960d9efa645fff83d3ec2c5d;hpb=14c3b13622af672ca0868dcab4e0e4c591dd70fb;p=openvswitch

diff --git a/debian/rules b/debian/rules
index b1f9065c..4a02a49e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,7 @@ configure-stamp:
 	dh_testdir
 	test -e configure || ./boot.sh
 	test -d _debian || mkdir _debian
+	echo $(DEB_BUILD_OPTIONS)
 	echo $$CC
 	cd _debian && ( \
 		test -e Makefile || \
@@ -44,7 +45,10 @@ build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 	$(MAKE) -C _debian
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) -C _debian check
+	if $(MAKE) -C _debian check; then :; else \
+		cat _debian/tests/testsuite.log; \
+		exit 1; \
+	fi
 endif
 	touch $@
 
@@ -117,3 +121,9 @@ binary-arch: install-arch
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+
+# This GNU make extensions disables parallel builds for the current Makefile
+# but not for sub-Makefiles.  This is appropriate here because build-arch and
+# build-indep both invoke "make" on OVS, which can update some of the same
+# targets in ways that conflict (e.g. both update tests/testsuite).
+.NOTPARALLEL: