Skip to content

Commit

Permalink
Don't use Set in test/run
Browse files Browse the repository at this point in the history
Since it's essential to checking the correctness of an hhvm build, we
want this script to work with php5.

Reviewed By: @scannell

Differential Revision: D1261809
  • Loading branch information
swtaarrs authored and sgolemon committed Apr 8, 2014
1 parent 6946ec9 commit c072db1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions hphp/test/run
Original file line number Diff line number Diff line change
Expand Up @@ -1224,20 +1224,20 @@ function main($argv) {
if (isset($options['repo'])) {
error("Server mode repo tests are not supported");
}
$configs = Set {};
$configs = array();
foreach ($tests as $test) {
if (!can_run_server_test($test)) continue;
$config = find_file_for_dir(dirname($test), 'config.hdf');
if (!$config) {
error("Couldn't find config file for $test");
}
$configs->add($config);
$configs[$config] = $config;
}
if ($configs->count() !== 1) {
if (count($configs) !== 1) {
error("You passed a combination of tests that would require more than ".
"one config file. This is not supported in server mode.");
}
$options['server_config'] = $configs->toVector()[0];
$options['server_config'] = reset($configs);
$server_status = start_server($options);
$options['server_port'] = $server_status['port'];
$server_proc = idx($server_status, 'proc');
Expand Down

0 comments on commit c072db1

Please sign in to comment.