Index: modules/simpletest/tests/module.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/module.test,v
retrieving revision 1.14
diff -u -r1.14 module.test
--- modules/simpletest/tests/module.test	29 Sep 2009 18:08:28 -0000	1.14
+++ modules/simpletest/tests/module.test	9 Nov 2009 20:17:21 -0000
@@ -77,7 +77,7 @@
    */
   protected function assertModuleList(Array $expected_values, $condition) {
     $expected_values = array_combine($expected_values, $expected_values);
-    $this->assertIdentical($expected_values, module_list(), t('@condition: module_list() returns correct results', array('@condition' => $condition)));
+    $this->assertEqual($expected_values, module_list(), t('@condition: module_list() returns correct results', array('@condition' => $condition)));
     ksort($expected_values);
     $this->assertIdentical($expected_values, module_list(FALSE, FALSE, TRUE), t('@condition: module_list() returns correctly sorted results', array('@condition' => $condition)));
   }
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.838
diff -u -r1.838 system.module
--- modules/system/system.module	8 Nov 2009 10:29:23 -0000	1.838
+++ modules/system/system.module	9 Nov 2009 20:17:21 -0000
@@ -1978,7 +1978,7 @@
     if (isset($files[$file->name]) && is_object($files[$file->name])) {
       $file->uri = $file->filename;
       foreach ($file as $key => $value) {
-        if (!isset($files[$file->name]->key)) {
+        if (!isset($files[$file->name]->$key)) {
           $files[$file->name]->$key = $value;
         }
       }
@@ -2122,6 +2122,9 @@
 
   // Read info files for each module.
   foreach ($modules as $key => $module) {
+    // Filename key is used in system table so copy value.
+    $modules[$key]->filename = $module->uri;
+
     // Look for the info file.
     $module->info = drupal_parse_info_file(dirname($module->uri) . '/' . $module->name . '.info');