clear out rpython/_cache CACHE_DIR before running tests

1 files changed, 8 insertions, 2 deletions

diff --git a/pypy/test_all.py b/pypy/test_all.py
index 9249362d44..71c5d76de7 100755
--- a/pypy/test_all.py
+++ b/pypy/test_all.py
@@ -17,14 +17,20 @@ You need to pick a particular subdirectory and run
 For more information, use test_all.py -h.
 """
 import sys, os
+import shutil
 
 
 if __name__ == '__main__':
     if len(sys.argv) == 1 and os.path.dirname(sys.argv[0]) in '.':
         print >> sys.stderr, __doc__
         sys.exit(2)
-    #Add toplevel repository dir to sys.path
-    sys.path.insert(0,os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
+    toplevel = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+    # Always remove the cached files
+    # Before translation this is done via "py.path.local(CACHE_DIR).remove()"
+    print 'removing %s/rpython/_cache' % toplevel
+    shutil.rmtree('%s/rpython/_cache', ignore_errors=True)
+    # Add toplevel repository dir to sys.path
+    sys.path.insert(0, toplevel)
     import pytest
     if sys.platform == 'win32':
         #Try to avoid opening a dialog box if one of the tests causes a system error