diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-04-25 11:06:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 11:06:10 +0200 |
| commit | 77bb867ad5c74216364d593c419419412d27594f (patch) | |
| tree | a15a73dc5219421a3f878fc2f95df5c4853ce5f8 | |
| parent | 3aa17672a1843cc5326caff1435a01e7e5d2867f (diff) | |
| parent | 3294bbe3bb73f6e5089fc0f3b95a28ffca7d1faa (diff) | |
| download | nextcloud-server-77bb867ad5c74216364d593c419419412d27594f.tar.gz nextcloud-server-77bb867ad5c74216364d593c419419412d27594f.zip | |
Merge pull request #37868 from nextcloud/bugfix/noid/fix-phpunit-version-check
fix(autotest): Fix PHPUNIT version check in autotest files
| -rwxr-xr-x | autotest-external.sh | 4 | ||||
| -rwxr-xr-x | autotest.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/autotest-external.sh b/autotest-external.sh index a541a5cf937..bc40e2474cd 100755 --- a/autotest-external.sh +++ b/autotest-external.sh @@ -39,8 +39,8 @@ PHPUNIT_VERSION=$("$PHPUNIT" --version | cut -d" " -f2) PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1) PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2) -if ! [ $PHPUNIT_MAJOR_VERSION -gt 4 -o \( $PHPUNIT_MAJOR_VERSION -eq 4 -a $PHPUNIT_MINOR_VERSION -ge 8 \) ]; then - echo "phpunit version >= 4.8 required. Version found: $PHPUNIT_VERSION" >&2 +if ! [ $PHPUNIT_MAJOR_VERSION -gt 9 -o \( $PHPUNIT_MAJOR_VERSION -eq 9 -a $PHPUNIT_MINOR_VERSION -ge 0 \) ]; then + echo "phpunit version >= 9.0 required. Version found: $PHPUNIT_VERSION" >&2 exit 4 fi diff --git a/autotest.sh b/autotest.sh index 81123b40567..6f82b42283c 100755 --- a/autotest.sh +++ b/autotest.sh @@ -77,7 +77,7 @@ PHPUNIT_VERSION=$($PHPUNIT --version | cut -d" " -f2) PHPUNIT_MAJOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f1) PHPUNIT_MINOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f2) -if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 6 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 9 -a "$PHPUNIT_MINOR_VERSION" -ge 0 \) ]; then +if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 9 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 9 -a "$PHPUNIT_MINOR_VERSION" -ge 0 \) ]; then echo "phpunit version >= 9.0 required. Version found: $PHPUNIT_VERSION" >&2 exit 4 fi |