mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-28 08:14:03 +02:00
Move ordering of make after cd in runtests.sh
Jenkins called make from a different folder and didn't find the makefile. It's moved now after the cd directive refs #4258
This commit is contained in:
parent
03ad76b739
commit
a6100acaa8
@ -6,10 +6,6 @@ SCRIPTNAME=$(readlink -f $0)
|
|||||||
DIR=$(dirname $SCRIPTNAME)
|
DIR=$(dirname $SCRIPTNAME)
|
||||||
PHPUNIT=$(which phpunit)
|
PHPUNIT=$(which phpunit)
|
||||||
|
|
||||||
if [[ ! -x ./bin/extcmd_test ]]; then
|
|
||||||
make
|
|
||||||
fi;
|
|
||||||
|
|
||||||
if [[ ! -x $PHPUNIT ]]; then
|
if [[ ! -x $PHPUNIT ]]; then
|
||||||
echo "PHPUnit not found!"
|
echo "PHPUnit not found!"
|
||||||
exit 1
|
exit 1
|
||||||
@ -20,6 +16,11 @@ mkdir -p $DIR/../../build/log
|
|||||||
|
|
||||||
cd $DIR
|
cd $DIR
|
||||||
|
|
||||||
|
if [[ ! -x ./bin/extcmd_test ]]; then
|
||||||
|
make
|
||||||
|
fi;
|
||||||
|
|
||||||
|
|
||||||
$PHPUNIT "$@"
|
$PHPUNIT "$@"
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user