Index: review/coder/pifr_coder.client.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/review/coder/pifr_coder.client.inc,v
retrieving revision 1.20
diff -u -r1.20 pifr_coder.client.inc
--- review/coder/pifr_coder.client.inc	15 Mar 2010 19:40:47 -0000	1.20
+++ review/coder/pifr_coder.client.inc	19 Mar 2010 01:06:01 -0000
@@ -121,15 +121,6 @@
       }
       return $files;
     }
-    elseif (!empty($this->arguments['test.directory.review'])) {
-      $files = $this->syntax_files();
-      foreach ($files as $key => $file) {
-        if (strpos($file, $this->arguments['test.directory.review']) !== 0) {
-          unset($files[$key]);
-        }
-      }
-      return $files;
-    }
     elseif (PIFR_DEBUG) {
       return array('index.php');
     }
Index: review/server.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/review/server.inc,v
retrieving revision 1.19
diff -u -r1.19 server.inc
--- review/server.inc	24 Feb 2010 01:19:49 -0000	1.19
+++ review/server.inc	19 Mar 2010 01:06:01 -0000
@@ -20,7 +20,7 @@
    */
   protected $argument_default = array(
     'test.title' => NULL,
-    'test.directory.review' => '',
+    'test.directory.review' => array(''),
     'test.directory.apply' => '',
     'test.directory.dependency' => '',
     'test.files' => array(),
Index: review/client.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/review/client.inc,v
retrieving revision 1.38
diff -u -r1.38 client.inc
--- review/client.inc	10 Mar 2010 19:19:18 -0000	1.38
+++ review/client.inc	19 Mar 2010 01:06:01 -0000
@@ -638,12 +638,14 @@
       }
     }
     else {
-      // Check all the files in the checkout directory and make their paths
-      // relative to the checkout directory.
-      $base = rtrim($this->checkout_directory . '/' . $this->arguments['test.directory.review'], '/');
-      $scan = file_scan_directory($base, '.*');
-      foreach ($scan as $file) {
-        $files[] = str_replace($this->checkout_directory . '/', '', $file->filename);
+      foreach ($this->arguments['test.directory.review'] as $directory) {
+        // Check all the files in the review directory and make their paths
+        // relative to the checkout directory.
+        $base = rtrim($this->checkout_directory . '/' . $directory, '/');
+        $scan = file_scan_directory($base, '.*');
+        foreach ($scan as $file) {
+          $files[] = str_replace($this->checkout_directory . '/', '', $file->filename);
+        }
       }
     }
     return $files;
Index: review/simpletest/pifr_simpletest.client.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/review/simpletest/pifr_simpletest.client.inc,v
retrieving revision 1.42
diff -u -r1.42 pifr_simpletest.client.inc
--- review/simpletest/pifr_simpletest.client.inc	18 Mar 2010 22:25:51 -0000	1.42
+++ review/simpletest/pifr_simpletest.client.inc	19 Mar 2010 01:06:01 -0000
@@ -188,12 +188,13 @@
       }
       return '--file ' . implode(',', $args);
     }
-    elseif (!empty($this->arguments['test.directory.review'])) {
-      $scan = file_scan_directory($this->checkout_directory . '/' . $this->arguments['test.directory.review'], '\.test$');
-
-      $files = array();
-      foreach ($scan as $file) {
-        $files[] = str_replace($this->checkout_directory . '/', '', $file->filename);
+    elseif (!empty($this->arguments['test.directory.review'][0])) {
+      // Remove any none test files.
+      $files = $this->syntax_files();
+      foreach ($files as $key => $file) {
+        if (pathinfo($file, PATHINFO_EXTENSION) != 'test') {
+          unset($files[$key]);
+        }
       }
       return '--file ' . implode(',', $files);
     }
Index: util/queue.example.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue_file_review/util/queue.example.php,v
retrieving revision 1.2
diff -u -r1.2 queue.example.php
--- util/queue.example.php	9 Mar 2010 02:12:09 -0000	1.2
+++ util/queue.example.php	19 Mar 2010 01:06:01 -0000
@@ -16,7 +16,7 @@
  * Review
  *   - plugin: pifr_simpletest (SimpleTest)
  *   - arguments:
- *     - test.directory.review:sites/all/modules (location of custom code)
+ *     - test.directory.review[]:sites/all/modules (location of custom code)
  *     - drupal.core.version:7 (or relevant core version)
  *     - drupal.core.url:bzr://bzr.example.com (only use if repository includes Drupal core)
  *     - simpletest.db:http://dev.example.com/dev-db.sql (db dump used with DrupalCloneTestCase)
@@ -28,7 +28,7 @@
  * Review
  *   - plugin: pifr_coder (Coder)
  *   - arguments:
- *     - test.directory.review:sites/all/modules (location of custom code)
+ *     - test.directory.review[]:sites/all/modules (location of custom code)
  *     - drupal.core.version:7 (or relevant core version)
  *     - drupal.core.url:bzr://bzr.example.com (only use if repository includes Drupal core)
  *     - coder.annotate:1 (enables blame feature)
@@ -131,7 +131,7 @@
       'vcs_identifier' => 'example-branch',
       'plugin_argument' => array(
         'test.title' => 'Example Project - core',
-        'test.directory.review' => '', // Override environment default.
+        'test.directory.review' => array(''), // Override environment default.
       ),
       'test' => TRUE,
       'link' => 'http://code.example.com/example-branch',