Fix repo-auth and proxygen options for batch mode

facebookarchive · Jun 4, 2015 · 601acd5 · 601acd5
1 parent 5355d7d
commit 601acd5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/base/PerfOptions.php b/base/PerfOptions.php
@@ -232,10 +232,10 @@ public function __construct(Vector<string> $argv) {
     $this->skipDatabaseInstall = $this->getBool('skip-database-install');
     $this->noTimeLimit = $this->getBool('no-time-limit');
     $this->waitAtEnd = $this->getBool('wait-at-end');
-    $this->proxygen = $this->hhvm && !$this->getBool('no-proxygen');
+    $this->proxygen = !$this->getBool('no-proxygen');
     $this->applyPatches = $this->getBool('apply-patches');
 
-    $this->precompile  = $this->hhvm && !$this->getBool('no-repo-auth');
+    $this->precompile  = !$this->getBool('no-repo-auth');
     $this->filecache = $this->getBool('file-cache');
     $this->pcreCache = $this->getNullableString('pcre-cache');
     $this->pcreSize = $this->getNullableInt('pcre-cache-size');
@@ -310,6 +310,10 @@ public function __construct(Vector<string> $argv) {
   }
 
   public function validate() {
+    if ($this->php5) {
+      $this->precompile = false;
+      $this->proxygen = false;
+    }
     if ($this->notBenchmarkingArgs && !$this->notBenchmarking) {
       $message = sprintf(
         "These arguments are invalid without --i-am-not-benchmarking: %s",