From e1d5ccb487c261c7e71d8c64d28f3f7de13d34aa Mon Sep 17 00:00:00 2001
From: Fabian Becker <halfdan@xnorfz.de>
Date: Sat, 9 Mar 2013 15:45:30 +0100
Subject: [PATCH] Restructure travis build. This now builds PHP 5.3/5.4/5.5 x 3
Testsuites + all PHP x whole test (for code coverage)
---
.travis.yml | 5 +++--
tests/PHPUnit/travis.sh | 8 ++++++++
tests/{travis.sh => travis/prepare.sh} | 0
3 files changed, 11 insertions(+), 2 deletions(-)
create mode 100755 tests/PHPUnit/travis.sh
rename tests/{travis.sh => travis/prepare.sh} (100%)
diff --git a/.travis.yml b/.travis.yml
index 97d004a4a7..6d83e99f03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,13 @@ env:
- TEST_SUITE=PluginTests
- TEST_SUITE=CoreTests
- TEST_SUITE=IntegrationTests
+ - TEST_SUITE=
-script: phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --coverage-text --colors
+script: ./travis.sh
before_script:
- mysql -e 'create database piwik_test;'
- - ./tests/travis.sh
+ - ./tests/prepare.sh
- ./tests/travis/setup_webserver.sh
- cd tests/PHPUnit
diff --git a/tests/PHPUnit/travis.sh b/tests/PHPUnit/travis.sh
new file mode 100755
index 0000000000..086f4b5082
--- /dev/null
+++ b/tests/PHPUnit/travis.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -n "$TEST_SUITE"]
+then
+ phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --coverage-text --colors
+else
+ phpunit --configuration phpunit.xml --coverage-text --colors
+fi
diff --git a/tests/travis.sh b/tests/travis/prepare.sh
similarity index 100%
rename from tests/travis.sh
rename to tests/travis/prepare.sh
--
GitLab