TMP testing directory should only be cleaned up when testing the core…

… after cleaning up the global tmp dir.
akelos · Jun 19, 2011 · fa34833 · fa34833
1 parent ce02c7c
commit fa34833
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/active_support/testing/suite.php b/active_support/testing/suite.php
@@ -221,15 +221,15 @@ static function ensureTmpDirPermissions(){
     }
 
     static function cleanupTmpDir() {
+
+        if(strstr(AK_BASE_DIR, AK_TMP_DIR)){
+            return;
+        }
+
         clearstatcache();
         $files = glob(AK_TMP_DIR.DS.'*');
         $files = array_diff($files, array(''));
 
-        $framework_testing_tmp = AK_FRAMEWORK_DIR.DS.'app_layout'.DS.'tmp'.DS.'testing';
-        if(is_dir($framework_testing_tmp)){
-            AkFileSystem::directory_delete($framework_testing_tmp);
-        }
-
         foreach ($files as $file){
             if(!is_dir($file)){
                 if($file != '.gitignore'){
@@ -239,6 +239,11 @@ static function cleanupTmpDir() {
                 AkFileSystem::rmdir_tree($file);
             }
         }
+
+        $framework_testing_tmp = AK_FRAMEWORK_DIR.DS.'app_layout'.DS.'tmp'.DS.'testing'.DS.'web';
+        if(is_dir($framework_testing_tmp)){
+            AkFileSystem::directory_delete($framework_testing_tmp);
+        }
     }
 
     public function log($message) {