[Zope3-checkins] SVN: Zope3/trunk/releases/Zope/ Merge from 3.3 branch:

[Philipp von Weitershausen]

Log message for revision 69448:
  Merge from 3.3 branch:
   Log message for revision 69447:
    Undo r68020 when the tarball's test.py script was removed.  Also made it
    use the new testrunner now.
    
    This addresses collector #602. The tests of the tarball don't pass for me, though
    (ZEO tests fail and hang).
  

Changed:
  U   Zope3/trunk/releases/Zope/PACKAGE.cfg
  A   Zope3/trunk/releases/Zope/test.py

-=-
Modified: Zope3/trunk/releases/Zope/PACKAGE.cfg
===================================================================
--- Zope3/trunk/releases/Zope/PACKAGE.cfg	2006-08-13 19:05:49 UTC (rev 69447)
+++ Zope3/trunk/releases/Zope/PACKAGE.cfg	2006-08-13 19:06:48 UTC (rev 69448)
@@ -11,4 +11,5 @@
   LICENSES.txt
   README.txt
   ZopePublicLicense.txt
+  test.py
 </distribution>

Copied: Zope3/trunk/releases/Zope/test.py (from rev 69447, Zope3/branches/3.3/releases/Zope/test.py)