move C++ test running to test/run + make output prettier
This commit is contained in:
parent
44d4068571
commit
5a594dd0c1
2 changed files with 11 additions and 1 deletions
2
Makefile
2
Makefile
|
@ -59,7 +59,7 @@ uninstall:
|
|||
@$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall
|
||||
|
||||
test:
|
||||
./run_tests
|
||||
@./test/run
|
||||
|
||||
check: test
|
||||
|
||||
|
|
|
@ -2,8 +2,15 @@
|
|||
|
||||
failures=0
|
||||
|
||||
cd "$( dirname "${BASH_SOURCE[0]}" )"
|
||||
cd ../
|
||||
source ./localize.sh
|
||||
|
||||
function run_step { >&2 echo -e "\033[1m\033[34m* $1\033[0m"; }
|
||||
function run_substep { >&2 echo -e "\033[1m\033[36m* $1\033[0m"; }
|
||||
function run_success { >&2 echo -e "\033[1m\033[32m* $1\033[0m"; }
|
||||
|
||||
run_step "Starting Mapnik tests"
|
||||
# mapnik-settings.env is an optional file to store
|
||||
# environment variables that should be used before
|
||||
# running tests like PROJ_LIB, GDAL_DATA, and ICU_DATA
|
||||
|
@ -11,12 +18,15 @@ source ./localize.sh
|
|||
# building against binary versions of dependencies like
|
||||
# done via bootstrap.sh
|
||||
if [[ -f mapnik-settings.env ]]; then
|
||||
run_substep "Inheriting from mapnik-settings.env"
|
||||
source mapnik-settings.env
|
||||
fi
|
||||
|
||||
run_substep "Running C++ Unit tests..."
|
||||
./test/unit/run
|
||||
failures=$((failures+$?))
|
||||
|
||||
run_substep "Running standalone C++ tests..."
|
||||
if [ -n "$(find test/standalone/ -maxdepth 1 -name '*-bin' -print -quit)" ]; then
|
||||
for FILE in test/standalone/*-bin; do
|
||||
${FILE};
|
Loading…
Reference in a new issue