Merge branch 'PHP-5.6'

* PHP-5.6: Revert "don't try to send in the test results until we restored qa.php.net" as qa.php.net is back.
lc-Arvin · Dec 1, 2014 · d046857 · d046857
2 parents 49de5b7 + d964832
commit d046857
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -46,5 +46,5 @@ before_script:
 
 # Run PHPs run-tests.php 
 script:
-    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 -s
+    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
     - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg