summarylogtreecommitdiffstats
path: root/cache-is-executable-result.patch
diff options
context:
space:
mode:
authorYen Chi Hsuan2015-08-15 22:28:48 +0800
committerYen Chi Hsuan2015-08-15 22:28:48 +0800
commit72c77c3b2cdb3cdf0ec0232a634f0d927f56c9fc (patch)
tree708851b9a366f7b8af737e3f4f98308581e77ec3 /cache-is-executable-result.patch
parent49979f8daab107f587d9456cf0e706f328330204 (diff)
downloadaur-72c77c3b2cdb3cdf0ec0232a634f0d927f56c9fc.tar.gz
Remove accepted and unnecessary patches
Diffstat (limited to 'cache-is-executable-result.patch')
-rw-r--r--cache-is-executable-result.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/cache-is-executable-result.patch b/cache-is-executable-result.patch
new file mode 100644
index 000000000000..bb9083a49b2a
--- /dev/null
+++ b/cache-is-executable-result.patch
@@ -0,0 +1,25 @@
+diff --git a/hphp/test/run b/hphp/test/run
+index f3baa1e..0190423 100755
+--- a/hphp/test/run
++++ b/hphp/test/run
+@@ -1424,6 +1424,11 @@ function run_and_lock_test($options, $test) {
+ }
+
+ function run_test($options, $test) {
++ static $timeout_executable_available = null;
++ if (is_null($timeout_executable_available)) {
++ $timeout_executable_available = is_executable('/usr/bin/timeout');
++ }
++
+ if (skip_test($options, $test)) return 'skip';
+
+ $test_ext = pathinfo($test, PATHINFO_EXTENSION);
+@@ -1433,7 +1438,7 @@ function run_test($options, $test) {
+ return 'skip';
+ }
+
+- if (is_executable('/usr/bin/timeout')) {
++ if ($timeout_executable_available) {
+ $hhvm = '/usr/bin/timeout 300 '.$hhvm;
+ } else {
+ $hhvm = __DIR__.'/../tools/timeout.sh -t 300 '.$hhvm;