sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move C++ test running to test/run + make output prettier

Browse source
This commit is contained in:
Dane Springmeyer 2015-04-30 07:41:16 -07:00
parent 44d4068571
commit 5a594dd0c1
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -59,7 +59,7 @@ uninstall:
@$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall @$(PYTHON) scons/scons.py -j$(JOBS) --config=cache --implicit-cache --max-drift=1 uninstall
test: test:
./run_tests @./test/run
check: test check: test

10
run_tests → test/run
View file

@ -2,8 +2,15 @@
failures=0 failures=0
cd "$( dirname "${BASH_SOURCE[0]}" )"
cd ../
source ./localize.sh 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 # mapnik-settings.env is an optional file to store
# environment variables that should be used before # environment variables that should be used before
# running tests like PROJ_LIB, GDAL_DATA, and ICU_DATA # running tests like PROJ_LIB, GDAL_DATA, and ICU_DATA
@ -11,12 +18,15 @@ source ./localize.sh
# building against binary versions of dependencies like # building against binary versions of dependencies like
# done via bootstrap.sh # done via bootstrap.sh
if [[ -f mapnik-settings.env ]]; then if [[ -f mapnik-settings.env ]]; then
run_substep "Inheriting from mapnik-settings.env"
source mapnik-settings.env source mapnik-settings.env
fi fi
run_substep "Running C++ Unit tests..."
./test/unit/run ./test/unit/run
failures=$((failures+$?)) failures=$((failures+$?))
run_substep "Running standalone C++ tests..."
if [ -n "$(find test/standalone/ -maxdepth 1 -name '*-bin' -print -quit)" ]; then if [ -n "$(find test/standalone/ -maxdepth 1 -name '*-bin' -print -quit)" ]; then
for FILE in test/standalone/*-bin; do for FILE in test/standalone/*-bin; do
${FILE}; ${FILE};