travis: update

diff --git a/.travis.yml b/.travis.yml
index 6ff0e26b97b4fb46f59ad817e6707a63bcacec0e..155ca9fd2f9d42c66adb93c0d98d98681cf610ad 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,15 @@ addons:
   packages:
    - php5-cli
    - php-pear
+   - valgrind
    - re2c
    - libidn11-dev
    - libsqlite3-dev
 
 env:
  matrix:
-  - PHP=master enable_debug=no enable_psi=yes enable_psi_posix=all LEMON='$(PHP_PSI_BUILDDIR)/lemon'
-  - PHP=master enable_debug=yes enable_psi=yes enable_psi_posix=all LEMON='$(PHP_PSI_BUILDDIR)/lemon'
+  - PHP=master enable_debug=no enable_psi=yes enable_psi_posix=all
+  - PHP=master enable_debug=yes enable_psi=yes enable_psi_posix=all
 
 before_script:
  - make -f travis/pecl/Makefile php
@@ -26,4 +27,5 @@ script:
 
 after_failure:
  - cat config.log | curl -F 'sprunge=<-' http://sprunge.us
+ - cat tests/parser/dump001.psi
  - ldd .libs/psi.so

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 7c515d709d9f4246c09efcbb3fb5267e83b53373..4c21d6afb1b04bc246f84fcf86bb34eba9ebc8a1 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -9,6 +9,7 @@ addons:
   packages:
    - php5-cli
    - php-pear
+   - valgrind
    - re2c
    - libidn11-dev
    - libsqlite3-dev
@@ -24,7 +25,6 @@ $env = $gen([
        #"enable_maintainer_zts",
        "enable_psi" => ["yes"],
        "enable_psi_posix" => ["all"],
-       "LEMON" => ["'\$(PHP_PSI_BUILDDIR)/lemon'"]
 ]);
 foreach ($env as $e) {
        printf("  - %s\n", $e);
@@ -41,4 +41,5 @@ script:
 
 after_failure:
  - cat config.log | curl -F 'sprunge=<-' http://sprunge.us
+ - cat tests/parser/dump001.psi
  - ldd .libs/psi.so

diff --git a/travis/pecl b/travis/pecl
index 90af692cb807f63c4d4e943ff4699dc9637728fb..79de9c8e52f16a2e06324683cf4c00c91df1b6c1 160000 (submodule)
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit 90af692cb807f63c4d4e943ff4699dc9637728fb
+Subproject commit 79de9c8e52f16a2e06324683cf4c00c91df1b6c1