summaryrefslogtreecommitdiff
path: root/modules/simpletest
diff options
context:
space:
mode:
Diffstat (limited to 'modules/simpletest')
-rw-r--r--modules/simpletest/drupal_web_test_case.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 35042ad2c..eba232b86 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -486,13 +486,19 @@ class DrupalWebTestCase {
}
/**
- * Compare two files based on size.
+ * Compare two files based on size and file name.
*/
function drupalCompareFiles($file1, $file2) {
- if (stat($file1->filename) > stat($file2->filename)) {
- return 1;
+ // Determine which file is larger.
+ $compare_size = (filesize($file1->filename) > filesize($file2->filename));
+ if (!$compare_size) {
+ // Both files were the same size, so return whichever one is alphabetically greater.
+ return strnatcmp($file1->name, $file2->name);
+ }
+ else {
+ // Return TRUE if $file1 is larger than $file2.
+ return $compare_size;
}
- return -1;
}
/**