diff --git a/.travis.yml b/.travis.yml index d4ef67eb..4bcc8b2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,12 @@ php: - 5.4 - 5.5 +branches: + except: + - share + script: - - phpunit --configuration tests/phpunit.xml + - make unit-tests env: - DB=mysql diff --git a/Makefile b/Makefile index da7cc9f0..47578b56 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,9 @@ package_name=$(build_directory)$(app_name) test: javascript-tests unit-tests integration-tests acceptance-tests unit-tests: - phpunit tests/vobject.php + phpunit --configuration tests/phpunit.xml + +#tests/vobject.php integration-tests: