Index: modules/simpletest/simpletest.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/simpletest.install,v
retrieving revision 1.7
diff -u -p -r1.7 simpletest.install
--- modules/simpletest/simpletest.install	16 Aug 2008 20:57:14 -0000	1.7
+++ modules/simpletest/simpletest.install	6 Sep 2008 23:14:40 -0000
@@ -28,12 +28,11 @@ function simpletest_install() {
     }
 
     // Copy other test files for consistency.
-    $files = file_scan_directory($path, '(html|image|javascript|php|sql)-.*');
-    if (count($files) == 0) {
-      $original = drupal_get_path('module', 'simpletest') . '/files';
-      $files = file_scan_directory($original, '(html|image|javascript|php|sql)-.*');
+    $original = drupal_get_path('module', 'simpletest') . '/files';
+    $files = file_scan_directory($original, '(html|image|javascript|php|sql)-.*');
+    if (count($files) > count(file_scan_directory($path, '(html|image|javascript|php|sql)-.*'))) {
       foreach ($files as $file) {
-        file_copy($file->filename, $path . '/' . $file->basename);
+        file_copy($file->filename, $path, FILE_EXISTS_REPLACE);
       }
       $generated = TRUE;
     }