From 76285adc563dc4400c45a15c093f08b7341ec75d Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Wed, 20 Nov 2013 22:43:15 -0600
Subject: [PATCH] attempt to push test responsibility off to travis: round 1
---
.travis.yml | 23 +++++++++++++++--------
src/bindings/php/SConscript | 8 ++++----
src/bindings/php/hammer.ini | 3 ++-
3 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 73d132af..10a4bc07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,19 +2,26 @@ language: c
compiler:
- gcc
- clang
+matrix:
+ include:
+ - compiler: gcc
+ language: php
+ php:
+ - 5.5
+ - 5.4
+ - compiler: clang
+ language: php
+ php:
+ - 5.5
+ - 5.4
before_install:
- sudo apt-get update -qq
- - sudo apt-get install -qq swig php5-dev php-pear
- - sudo pear channel-discover pear.phpunit.de
- - sudo pear channel-discover pear.symfony-project.com
- - sudo pear channel-discover components.ez.no
- - sudo pear update-channels
- - sudo pear upgrade-all
- - sudo pear install --alldeps phpunit/PHPUnit
- - sudo pear install --force --alldeps phpunit/PHPUnit
+ - sudo apt-get install -qq swig
before_script:
- phpenv config-add hammer.ini
script:
- scons
+after_script:
+ - phpunit
notifications:
irc: "irc.upstandinghackers.com#hammer"
diff --git a/src/bindings/php/SConscript b/src/bindings/php/SConscript
index 16cfe158..b165f205 100644
--- a/src/bindings/php/SConscript
+++ b/src/bindings/php/SConscript
@@ -16,9 +16,9 @@ swig = ['hammer.i']
libhammer_php = phpenv.SharedLibrary('hammer', swig)
-phptestenv = phpenv.Clone()
-phptestenv['ENV']['LD_LIBRARY_PATH'] = os.path.dirname(str(libhammer_shared[0]))
-tests = phptestenv.Dir('Tests/')
-phptestenv.Command(tests, [libhammer_php], "phpunit -v --include-path "+os.getcwd()+" $TARGET")
+#phptestenv = phpenv.Clone()
+#phptestenv['ENV']['LD_LIBRARY_PATH'] = os.path.dirname(str(libhammer_shared[0]))
+#tests = phptestenv.Dir('Tests/')
+#phptestenv.Command(tests, [libhammer_php], "phpunit -v --include-path "+os.getcwd()+" $TARGET")
Clean('.', ['hammer.php'])
diff --git a/src/bindings/php/hammer.ini b/src/bindings/php/hammer.ini
index 73111620..0556e281 100644
--- a/src/bindings/php/hammer.ini
+++ b/src/bindings/php/hammer.ini
@@ -1,2 +1,3 @@
enable_dl = On
-extension = "/home/travis/build/abiggerhammer/hammer/build/opt/src/bindings/libhammer.so"
\ No newline at end of file
+extension = "/home/travis/build/abiggerhammer/hammer/build/opt/src/bindings/libhammer.so"
+include_path = ".:/home/travis/build/abiggerhammer/hammer/build/opt/src/bindings"
\ No newline at end of file
--
GitLab