From: Bob Weinand <bobwei9@hotmail.com>
Date: Sun, 15 Jun 2014 13:47:14 +0000 (+0200)
Subject: Merge sapi/phpdbg into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~189^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f677889a9a536d506febc13e1022eb4816fb5fa1;p=php

Merge sapi/phpdbg into PHP-5.6
---

f677889a9a536d506febc13e1022eb4816fb5fa1
diff --cc sapi/phpdbg/.travis.yml
index 353402858e,0000000000..d5b492e7cf
mode 100644,000000..100644
--- a/sapi/phpdbg/.travis.yml
+++ b/sapi/phpdbg/.travis.yml
@@@ -1,3 -1,0 +1,12 @@@
 +language: c
 +
- script: ./travis/ci.sh
++env:
++- PHP="PHP-5.4"
++- PHP="PHP-5.5"
++- PHP="PHP-5.6"
++- PHP="master"
++
++before_script: ./travis/ci.sh
++
++script:
++- ./php-src/sapi/cli/php php-src/sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg php-src/sapi/phpdbg/phpdbg