Better 3.x testing, etc.

3 files changed, 20 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index aad68429..c747d133 100644
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,12 @@ lint:
 	python /Python25/Lib/tabnanny.py coverage scripts test setup.py
 	python checkeol.py
 
-testready: $(TEST_ZIP) devinst
+testready: testdata devinst
 
 tests: testready
 	nosetests
 
+testdata: $(TEST_ZIP)
 $(TEST_ZIP): test/covmodzip1.py
 	zip -j $@ $+
 
diff --git a/notsource.txt b/notsource.txt
new file mode 100644
index 00000000..a037cd17
--- /dev/null
+++ b/notsource.txt
@@ -0,0 +1,4 @@
+.pyc

+\.hg\

+\build\

+.egg-info

diff --git a/three.cmd b/three.cmd
index 8698a2e8..93dd8f9d 100644
--- a/three.cmd
+++ b/three.cmd
@@ -1,9 +1,20 @@
 @REM Copy the sources, convert to Py3k, and run the tests.

 

 rmdir/s/q ..\three

-xcopy /s/h/i/e . ..\three

+xcopy /s/h/i/e /exclude:notsource.txt . ..\three

 cd ..\three

 call switchpy 31

 python \python31\Tools\Scripts\2to3.py -w coverage test setup.py mock.py

-make clean testready

-python \python31\Scripts\nosetests3

+make clean

+make testdata

+

+@REM We run coverage out of the source directory, so put built stuff there.

+python setup.py build

+copy build\lib.win32-3.1\coverage\tracer.pyd coverage

+

+@REM Run both modes of tracer

+set COVERAGE_TEST_TRACER=c

+python \python31\Scripts\nosetests3 %1

+del coverage\tracer.pyd

+set COVERAGE_TEST_TRACER=py

+python \python31\Scripts\nosetests3 %1