[pypy-svn] r71717 - pypy/build/ubuntu/debian

[getxsick at codespeak.net]

Author: getxsick
Date: Thu Mar  4 02:22:42 2010
New Revision: 71717

Modified:
   pypy/build/ubuntu/debian/Makefile.in
   pypy/build/ubuntu/debian/rules
Log:
update testing section
 - remove redundancy,
 - use symlink instead of hard copy,
 - fix PYTHONPATH issue


Modified: pypy/build/ubuntu/debian/Makefile.in
==============================================================================
--- pypy/build/ubuntu/debian/Makefile.in	(original)
+++ pypy/build/ubuntu/debian/Makefile.in	Thu Mar  4 02:22:42 2010
@@ -9,14 +9,16 @@
 
 BINARIES=%(BINARIES)s
 
-all: $(BINARIES) test
+all: $(BINARIES)
 
 test: export TMPDIR = $(CURDIR)/tests-tmp
-test: export PYTHONPATH = ".:"$(PYTHONPATH)
+test: export PYTHONPATH = $(CURDIR)
 test:
 	@rm -rf $(TMPDIR)
 	mkdir $(TMPDIR)
-	cp build-default/usession-$$USER/testing_1/testing_1 pypy/translator/goal/pypy-c
+	ln -s $(CURDIR)/bin/pypy $(CURDIR)/pypy/translator/goal/pypy-c
+	echo $(CURDIR)
+	echo $(PYTHONPATH)
 	set -e; python testrunner/runner.py \
 		--logfile=pytest-A.log \
 		--config=pypy/pytest-A.cfg \

Modified: pypy/build/ubuntu/debian/rules
==============================================================================
--- pypy/build/ubuntu/debian/rules	(original)
+++ pypy/build/ubuntu/debian/rules	Thu Mar  4 02:22:42 2010
@@ -27,6 +27,7 @@
 build-arch: build-arch-stamp
 build-arch-stamp: Makefile
 	$(MAKE) all
+	$(MAKE) test
 	touch $@
 
 build-indep: build-indep-stamp