Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
server
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Nextcloud
server
Commits
39f20258
Unverified
Commit
39f20258
authored
2 years ago
by
blizzz
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #36497 from nextcloud/techdebt/noid/fix-autotest-execution
Fix autotest.sh execution
parents
d83ea282
5096d4f5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
autotest.sh
+13
-12
13 additions, 12 deletions
autotest.sh
with
13 additions
and
12 deletions
autotest.sh
+
13
−
12
View file @
39f20258
...
...
@@ -30,15 +30,15 @@ if [ -z "$PHP_EXE" ]; then
fi
PHP
=
$(
which
"
$PHP_EXE
"
)
if
[
-z
"
$PHPUNIT_EXE
"
]
;
then
if
[
-f
"
build/integration/vendor/bin/phpunit
"
]
;
then
if
[
-f
build/integration/vendor/bin/phpunit
]
;
then
PHPUNIT_EXE
=
"./build/integration/vendor/bin/phpunit"
PHPUNIT
=
$(
readlink
-f
"
$PHPUNIT_EXE
"
)
else
PHPUNIT_EXE
=
phpunit
PHPUNIT
=
$(
which
"
$PHPUNIT_EXE
"
)
fi
fi
PHPUNIT
=
$(
which
"
$PHPUNIT_EXE
"
)
set
-e
_XDEBUG_CONFIG
=
$XDEBUG_CONFIG
...
...
@@ -61,7 +61,8 @@ else
fi
if
!
[
-x
"
$PHPUNIT
"
]
;
then
echo
"phpunit executable not found, please install phpunit version >= 9.0"
>
&2
echo
"phpunit executable not found, please install phpunit version >= 9.0 manually or via:"
>
&2
echo
" cd build/integration && composer install"
>
&2
exit
3
fi
...
...
@@ -76,8 +77,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
6
-o
\(
"
$PHPUNIT_MAJOR_VERSION
"
-eq
6
-a
"
$PHPUNIT_MINOR_VERSION
"
-ge
5
\)
]
;
then
echo
"phpunit version >=
6.5
required. Version found:
$PHPUNIT_VERSION
"
>
&2
if
!
[
"
$PHPUNIT_MAJOR_VERSION
"
-gt
6
-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
...
...
@@ -400,8 +401,8 @@ function execute_tests {
echo
"No coverage"
fi
echo
"
$PHP
"
"
${
PHPUNIT
[@]
}
"
--configuration
phpunit-autotest.xml
$GROUP
$COVER
--log-junit
"autotest-results-
$DB
.xml"
"
$2
"
"
$3
"
"
$PHP
"
"
${
PHPUNIT
[@]
}
"
--configuration
phpunit-autotest.xml
$GROUP
$COVER
--log-junit
"autotest-results-
$DB
.xml"
"
$2
"
"
$3
"
echo
"
$PHP
UNIT
"
--configuration
phpunit-autotest.xml
$GROUP
$COVER
--log-junit
"autotest-results-
$DB
.xml"
"
$2
"
"
$3
"
"
$PHP
UNIT
"
--configuration
phpunit-autotest.xml
$GROUP
$COVER
--log-junit
"autotest-results-
$DB
.xml"
"
$2
"
"
$3
"
RESULT
=
$?
if
[
"
$PRIMARY_STORAGE_CONFIG
"
==
"swift"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment