[Python-modules-commits] r28755 - in packages/ipython/trunk/debian (rules)

[jtaylor-guest at users.alioth.debian.org]

    Date: Saturday, May 3, 2014 @ 15:41:22
  Author: jtaylor-guest
Revision: 28755

run tests

Modified:
  packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2014-05-03 15:41:20 UTC (rev 28754)
+++ packages/ipython/trunk/debian/rules	2014-05-03 15:41:22 UTC (rev 28755)
@@ -11,6 +11,7 @@
 	rm -f test_hist.sqlite
 	if cd $(CURDIR)/docs; then $(MAKE) clean; fi
 	dh_auto_clean
+	rm -f install-stamp
 	rm -rf $(CURDIR)/build
 	# remove 0.13 generated files
 	rm -f $(CURDIR)/docs/source/_static/hist_simple.png
@@ -30,18 +31,16 @@
 	HOME=$(CURDIR)/build PYTHONPATH=$(CURDIR) $(MAKE) -C $(CURDIR)/docs html
 endif
 
-override_dh_auto_test:
+install-test: install-stamp
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
     	# test_not_writable_ipdir, fails as root
 	# test_console_starts, leaks python process
 	# test_constructor, test_notebook_help, as-installed only (static-path change)
-	set -e && for pyvers in $(PYVERS); do \
-	  LC_ALL=C.UTF-8 HOME=$(CURDIR)/build \
-	  PATH=$(CURDIR)/IPython/scripts/:$(PATH) PYTHONPATH=$(CURDIR) \
-	  xvfb-run -a -s "-screen 0 1280x1024x24 -noreset" \
-	  python$$pyvers $(CURDIR)/IPython/scripts/iptest -v -e test_not_writable_ipdir -e test_console_starts \
-			-e test_constructor -e test_notebook_help;\
-	done
+	cd build && LC_ALL=C.UTF-8 HOME=$(CURDIR)/build \
+	PATH=$(CURDIR)/debian/tmp/usr/bin/:$(PATH) PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages \
+	xvfb-run -a -s "-screen 0 1280x1024x24 -noreset" \
+	iptest -- -e test_not_writable_ipdir -e test_console_starts \
+		-e test_constructor -e test_notebook_help;
 endif
 
 override_dh_auto_install:
@@ -138,6 +137,8 @@
 	# change permission on scripts
 	find $(CURDIR)/debian/ipython-notebook-common -type f | xargs chmod a-x
 
+	touch install-stamp
+
 	
 override_dh_installdocs:
 ifeq (,$(filter nodocs,$(DEB_BUILD_OPTIONS)))
@@ -153,7 +154,7 @@
 endif
 
 # work around #683108
-override_dh_python2:
+override_dh_python2: install-test
 	dh_python2 -pipython
 	dh_python2 -pipython-qtconsole
 	dh_python2 -pipython-notebook