From 4d0825f33fd2c2c6599a5c33372818a6ed332088 Mon Sep 17 00:00:00 2001
From: David Alger <david@classyllama.com>
Date: Sat, 27 Feb 2016 22:17:47 -0600
Subject: [PATCH] Combines two static tests into a single static test build
---
.travis.yml | 3 +--
dev/travis/script.sh | 8 ++------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3c39ba12b46..758dad88f5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,7 @@ env:
- TEST_SUITE=unit
- TEST_SUITE=integration INTEGRATION_INDEX=1 INTEGRATION_SETS=2
- TEST_SUITE=integration INTEGRATION_INDEX=2 INTEGRATION_SETS=2
- - TEST_SUITE=static_phpcs
- - TEST_SUITE=static_annotation
+ - TEST_SUITE=static
cache:
apt: true
directories:
diff --git a/dev/travis/script.sh b/dev/travis/script.sh
index 7a5c5d5d9c0..31aab4631af 100755
--- a/dev/travis/script.sh
+++ b/dev/travis/script.sh
@@ -15,12 +15,8 @@ case $TEST_SUITE in
cd dev/tests/integration
phpunit -c phpunit.xml.travis$INTEGRATION_INDEX
;;
- static_phpcs)
+ static)
cd dev/tests/static
- phpunit -c phpunit.xml.dist --filter 'Magento\\Test\\Php\\LiveCodeTest::testCodeStyle'
- ;;
- static_annotation)
- cd dev/tests/static
- phpunit -c phpunit.xml.dist --filter 'Magento\\Test\\Php\\LiveCodeTest::testAnnotationStandard'
+ phpunit -c phpunit.xml.dist --filter 'Magento\\Test\\Php\\LiveCodeTest::(testCodeStyle|testAnnotationStandard)'
;;
esac
--
GitLab