Merge remote-tracking branch 'upstream/develop' into MAGETWO-69319-functional-test

Igor Melnikov · Igor Melnikov · commit 0abd1da9451d · 2017-05-18T22:26:01.000-05:00
diff --git a/dev/travis/script.sh b/dev/travis/script.sh
@@ -12,4 +12,7 @@ case $TEST_SUITE in
     js)
         grunt spec
         ;;
+    *)
+        phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER;
+        ;;
 esac
