diff --git a/build-linux-64.sh b/build-linux-64.sh index 5b0a9828..c0879f74 100755 --- a/build-linux-64.sh +++ b/build-linux-64.sh @@ -35,12 +35,8 @@ readelf -d ./light/light unzip -X ericw-tools-*.zip readelf -d ./ericw-tools-*/bin/light -# coarse tests on real maps (only checks success/failure exit status of tool) +# run regression tests cd .. -export PATH="$(pwd)/$BUILD_DIR/qbsp:$(pwd)/$BUILD_DIR/light:$PATH" +export PATH="$(pwd)/$BUILD_DIR/qbsp:$(pwd)/$BUILD_DIR/light:$(pwd)/$BUILD_DIR/vis:$PATH" cd testmaps ./automatated_tests.sh || exit 1 - -# test id1 maps for leaks -cd quake_map_source -./leaktest.sh || exit 1 diff --git a/build-osx.sh b/build-osx.sh index f26104ed..115da8d1 100755 --- a/build-osx.sh +++ b/build-osx.sh @@ -46,12 +46,8 @@ otool -L ./bsputil/bsputil ./light/testlight || exit 1 ./qbsp/testqbsp || exit 1 -# coarse tests on real maps (only checks success/failure exit status of tool) +# run regression tests cd .. -export PATH="$(pwd)/$BUILD_DIR/qbsp:$(pwd)/$BUILD_DIR/light:$PATH" +export PATH="$(pwd)/$BUILD_DIR/qbsp:$(pwd)/$BUILD_DIR/light:$(pwd)/$BUILD_DIR/vis:$PATH" cd testmaps ./automatated_tests.sh || exit 1 - -# test id1 maps for leaks -cd quake_map_source -./leaktest.sh || exit 1 diff --git a/testmaps/automatated_tests.sh b/testmaps/automatated_tests.sh index f88cea02..80c21dcd 100755 --- a/testmaps/automatated_tests.sh +++ b/testmaps/automatated_tests.sh @@ -51,3 +51,7 @@ done for bsp in ${HASH_CHECK_BSPS}; do light ${bsp} || exit 1 done + +# leak tests on all id1 maps +cd quake_map_source +./leaktest.sh || exit 1