From e731304d3d1e2052d36b7df70ca7567f55876625 Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Tue, 7 May 2013 13:33:37 -0700
Subject: [PATCH] make test/run work on stock PHP

I want people to start contributing to us from the community. I think them running the tests would be a good idea on any patch. I don't really want to assume they replaced their php binary with hhvm just yet, so I think the test runner should work on whatever php is in the path
---
 hphp/test/run | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/hphp/test/run b/hphp/test/run
index 6d1d1a773..a6233ceb4 100755
--- a/hphp/test/run
+++ b/hphp/test/run
@@ -130,20 +130,20 @@ function map_convenience_filename($file) {
     );
   }
 
-  $mappage = Map {
+  $mappage = array(
     'quick'    => 'hphp/test/quick',
     'slow'     => 'hphp/test/slow',
     'zend'     => 'hphp/test/zend/good',
     'zend_bad' => 'hphp/test/zend/bad',
-  };
+  );
 
   $m = null;
   if (!preg_match('/([^\/]*)(.*)/', $file, $m) ||
-      !$mappage->containsKey($m[1])) {
+      !isset($mappage[$m[1]])) {
     error("Not valid file or directory: '$file'");
   }
   if (!isset($m[2])) $m[2] = '';
-  return hphp_home().'/'.$mappage->get($m[1]).$m[2];
+  return hphp_home().'/'.$mappage[$m[1]].$m[2];
 }
 
 function find_tests($files) {
@@ -179,7 +179,8 @@ function find_config($tests, $name) {
       implode(' ', $configs).""
     );
   }
-  return array_values($configs)[0];
+  $ret = array_values($configs);
+  return $ret[0];
 }
 
 function find_config_for_dir($dir, $name) {
@@ -285,8 +286,10 @@ $verify = array(
   hphp_home().'/hphp/test/verify',
   '--command="'.implode(' ', command_arg($options, $tests)).'"',
   implode(' ', verify_args($options)),
-  '--hphp="'.implode(' ', hphp_arg($options, $tests)).'"',
 );
+if (isset($options['repo'])) {
+  $verify[] = '--hphp="'.implode(' ', hphp_arg($options, $tests)).'"';
+}
 
 $return_value = run(implode(' ', $verify), $tests);