From 71f2c408df83da070d5c33feca16d8bfb070664e Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Mon, 3 Jun 2013 15:24:39 +0200 Subject: [PATCH] Integrate PHPCS Fix absolute directory issue. refs #4070 refs #4098 refs #4099 --- test/js/checkswag.sh | 4 ++-- test/js/runtests.sh | 6 +++--- test/php/checkswag.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/js/checkswag.sh b/test/js/checkswag.sh index bfd8f26e4..704ed94ec 100755 --- a/test/js/checkswag.sh +++ b/test/js/checkswag.sh @@ -6,8 +6,8 @@ SCRIPTNAME=$(readlink -f $0) DIR=$(dirname $SCRIPTNAME) # Make sure that the destination directory for logs and reports exists -mkdir -p $DIR/build/log +mkdir -p $DIR/../../build/log -jshint --reporter=jslint "$@" ../.. > $DIR/build/log/jshint_results.xml +jshint --reporter=jslint "$@" $DIR/../.. > $DIR/../../build/log/jshint_results.xm exit 0 diff --git a/test/js/runtests.sh b/test/js/runtests.sh index 41af329ac..d0196b0a2 100755 --- a/test/js/runtests.sh +++ b/test/js/runtests.sh @@ -6,9 +6,9 @@ SCRIPTNAME=$(readlink -f $0) DIR=$(dirname $SCRIPTNAME) # Make sure that the destination directory for logs and reports exists -mkdir -p $DIR/build/log +mkdir -p $DIR/../../build/log -mocha --reporter "xunit" --recursive "$@" . > $DIR/build/log/mocha_results.xml -mocha --reporter "cobertura" --recursive "$@" . > $DIR/build/log/mocha_coverage.xml +mocha --reporter "xunit" --recursive "$@" . > $DIR/../../build/log/mocha_results.xml +mocha --reporter "cobertura" --recursive "$@" . > $DIR/../../build/log/mocha_coverage.xml exit 0 diff --git a/test/php/checkswag.sh b/test/php/checkswag.sh index dafbc52b1..f16f7e73f 100755 --- a/test/php/checkswag.sh +++ b/test/php/checkswag.sh @@ -8,6 +8,6 @@ DIR=$(dirname $SCRIPTNAME) # Make sure that the destination directory for logs and reports exists mkdir -p $DIR/../../build/log -phpcs -p --standard=PSR2 --extensions=php --encoding=utf-8 --report-checkstyle=$DIR/build/log/phpcs_results.xml --ignore=vendor "$@" ../.. +phpcs -p --standard=PSR2 --extensions=php --encoding=utf-8 --report-checkstyle=$DIR/build/log/phpcs_results.xml --ignore=vendor "$@" $DIR/../.. exit 0