From 13e04bc7d41f5fe9657a07c20a5e221bd318073d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 20 Feb 2018 17:40:09 +0100 Subject: [PATCH] Use phpunit's directory feature Signed-off-by: Joas Schilling --- autotest.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/autotest.sh b/autotest.sh index ff59386e1b..d8f62ce236 100755 --- a/autotest.sh +++ b/autotest.sh @@ -380,17 +380,9 @@ function execute_tests { echo "No coverage" fi - if [ -d "$2" ]; then - for f in $(find "$2" -name '*Test.php'); do - echo "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" / "$f" "$3" - "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$f" "$3" - RESULT=$? - done; - else - echo "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3" - "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3" - RESULT=$? - fi + echo "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3" + "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3" + RESULT=$? if [ "$PRIMARY_STORAGE_CONFIG" == "swift" ] ; then cd ..