From 08d34d47d5bca3bcce6e2b9aa39e1a76a7f7d15a Mon Sep 17 00:00:00 2001
From: David Alger <david@classyllama.com>
Date: Fri, 29 Apr 2016 20:06:23 -0500
Subject: [PATCH] Revert "Split static tests out using env var in travis
config"
This reverts commit f36c3c74369c6e1dd2c8bb59333e6c9878de6f44.
---
.travis.yml | 11 +++--------
dev/travis/script.sh | 2 +-
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 61103c12fdc..a3875f29e99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,7 @@ env:
- TEST_SUITE=unit
- TEST_SUITE=integration INTEGRATION_INDEX=1
- TEST_SUITE=integration INTEGRATION_INDEX=2
- - TEST_SUITE=static STATIC_FILTER='Magento\\Test\\Php\\LiveCodeTest::testCodeStyle'
- - TEST_SUITE=static STATIC_FILTER='Magento\\Test\\Php\\LiveCodeTest::testAnnotationStandard'
+ - TEST_SUITE=static
cache:
apt: true
directories:
@@ -29,13 +28,9 @@ cache:
matrix:
exclude:
- php: 5.6
- env: TEST_SUITE=static STATIC_FILTER='Magento\\Test\\Php\\LiveCodeTest::testCodeStyle'
+ env: TEST_SUITE=static
- php: 7.0
- env: TEST_SUITE=static STATIC_FILTER='Magento\\Test\\Php\\LiveCodeTest::testCodeStyle'
- - php: 5.6
- env: TEST_SUITE=static STATIC_FILTER='Magento\\Test\\Php\\LiveCodeTest::testAnnotationStandard'
- - php: 7.0
- env: TEST_SUITE=static STATIC_FILTER='Magento\\Test\\Php\\LiveCodeTest::testAnnotationStandard'
+ env: TEST_SUITE=static
before_install: ./dev/travis/before_install.sh
before_script: ./dev/travis/before_script.sh
script: ./dev/travis/script.sh
diff --git a/dev/travis/script.sh b/dev/travis/script.sh
index 6d58dc5be32..437fd86eb69 100755
--- a/dev/travis/script.sh
+++ b/dev/travis/script.sh
@@ -16,6 +16,6 @@ case $TEST_SUITE in
;;
static)
cd dev/tests/static
- phpunit --filter "$STATIC_FILTER"
+ phpunit --filter 'Magento\\Test\\Php\\LiveCodeTest::(testCodeStyle|testAnnotationStandard)'
;;
esac
--
GitLab