aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-05-16 16:18:02 -0500
committerMorris Jobke <hey@morrisjobke.de>2017-05-16 16:18:02 -0500
commit6dea5e6aadc9611821d6f6c3949af56e9ca298f7 (patch)
tree3ed0b1c7cf1bf341b6caeb67fda537523c32355b
parentf920dfe09b15e101bc4bdf7052afe116c6872742 (diff)
downloadnextcloud-server-6dea5e6aadc9611821d6f6c3949af56e9ca298f7.tar.gz
nextcloud-server-6dea5e6aadc9611821d6f6c3949af56e9ca298f7.zip
Implement skip checkers and log the currently tested app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
-rwxr-xr-xautotest-checkers.sh3
-rw-r--r--core/Command/App/CheckCode.php5
2 files changed, 6 insertions, 2 deletions
diff --git a/autotest-checkers.sh b/autotest-checkers.sh
index d6a45373879..35c945a17e9 100755
--- a/autotest-checkers.sh
+++ b/autotest-checkers.sh
@@ -12,7 +12,8 @@ php ./build/htaccess-checker.php
RESULT=$(($RESULT+$?))
-for app in $(find "apps/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do
+for app in $(find "apps/" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;); do
+ echo "Testing $app"
if
[ "$app" == "dav" ] || \
[ "$app" == "encryption" ] || \
diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php
index 22a1984b1b3..46b9b748ada 100644
--- a/core/Command/App/CheckCode.php
+++ b/core/Command/App/CheckCode.php
@@ -125,7 +125,10 @@ class CheckCode extends Command implements CompletionAwareInterface {
$output->writeln(" <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
}
});
- $errors = $codeChecker->analyse($appId);
+ $errors = [];
+ if(!$input->getOption('skip-checkers')) {
+ $errors = $codeChecker->analyse($appId);
+ }
if(!$input->getOption('skip-validate-info')) {
$infoChecker = new InfoChecker($this->infoParser);