[TASK] Simplify travis script 72/23172/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Sun, 18 Aug 2013 10:10:55 +0000 (12:10 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sun, 18 Aug 2013 10:29:41 +0000 (12:29 +0200)
The chmod for phpunit binaries is not needed after ext:phpunit
fixed this, the execute script itself is simplified a bit to
be better readable.

Change-Id: I9b6d1d1e2e9e4155ee20c3dfda4313d89fed0def
Resolves: #51153
Releases: 6.2
Reviewed-on: https://review.typo3.org/23172
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
.travis.yml

index 92bd69e..95dde70 100644 (file)
@@ -39,8 +39,6 @@ before_script:
        mv build-environment/typo3conf .
        git clone --single-branch --branch master --depth 1 git://git.typo3.org/TYPO3v4/Extensions/phpunit.git typo3conf/ext/phpunit/
        mkdir typo3temp
-       chmod u+x ./typo3conf/ext/phpunit/Composer/vendor/bin/phpunit
-       chmod u+x ./typo3conf/ext/phpunit/Composer/vendor/phpunit/phpunit/composer/bin/phpunit
     fi
 
   - >
@@ -55,12 +53,10 @@ script:
   - >
     if [[ "$PHPLINT" == "1" ]]; then
        phpLint all
-    fi
-  - >
-    if [[ "$UNITTESTS" == "1" ]]; then
+    elif [[ "$UNITTESTS" == "1" ]]; then
        php $PWD/typo3/cli_dispatch.phpsh phpunit -c typo3/sysext/core/Build/UnitTests.xml
-    fi
-  - >
-    if [[ "$FUNCTIONALTESTS" == "1" ]]; then
+    elif [[ "$FUNCTIONALTESTS" == "1" ]]; then
        ./typo3conf/ext/phpunit/Composer/vendor/bin/phpunit -c typo3/sysext/core/Build/FunctionalTests.xml
+    else
+       exit 1
     fi
\ No newline at end of file