From 44fc2ab05a88ae355787aaa3203ba49ce0014d27 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Mon, 15 Jan 2018 11:28:16 -0700 Subject: [PATCH] test: add invalid_texture_axes.map contributed by ww at: http://celephais.net/board/view_thread.php?id=61542&start=13&end=13 --- build-osx.sh | 11 ++-- testmaps/automatated_tests.sh | 7 +++ testmaps/invalid_texture_axes.map | 83 +++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 3 deletions(-) create mode 100755 testmaps/automatated_tests.sh create mode 100644 testmaps/invalid_texture_axes.map diff --git a/build-osx.sh b/build-osx.sh index 3f651490..3dc702b1 100755 --- a/build-osx.sh +++ b/build-osx.sh @@ -26,7 +26,12 @@ cpack ./light/testlight || exit 1 ./qbsp/testqbsp || exit 1 -# test id1 maps for leaks +# coarse tests on real maps (only checks success/failure exit status of tool) cd .. -cd testmaps/quake_map_source -PATH=../../$BUILD_DIR/qbsp ./leaktest.sh || exit 1 +export PATH="$(pwd)/$BUILD_DIR/qbsp:$(pwd)/$BUILD_DIR/light:$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 new file mode 100755 index 00000000..532d31b7 --- /dev/null +++ b/testmaps/automatated_tests.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +set -x + +qbsp invalid_texture_axes.map || exit 1 +light invalid_texture_axes.map || exit 1 + diff --git a/testmaps/invalid_texture_axes.map b/testmaps/invalid_texture_axes.map new file mode 100644 index 00000000..2048539f --- /dev/null +++ b/testmaps/invalid_texture_axes.map @@ -0,0 +1,83 @@ + +// entity 0 +{ +"classname" "worldspawn" +"wad" "elder.wad" +"_bounce" "1" +"_dirt" "1" +"_range" "1.2" +// brush 0 +{ +( 512 384 512 ) ( 512 128 512 ) ( 0 384 512 ) city4_7 [ 0 1 0 0 ] [ 1 0 0 0 ] -0 1 1 +( 512 512 384 ) ( 0 512 384 ) ( 512 512 0 ) city4_7 [ -1 0 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 512 384 384 ) ( 512 384 0 ) ( 512 128 384 ) city4_7 [ 0 1 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 0 0 0 ) ( 0 0 384 ) ( 512 0 0 ) city4_7 [ 1 -0 -0 0 ] [ -0 -0 -1 0 ] -0 1 1 +( 0 128 0 ) ( 0 384 0 ) ( 0 128 384 ) city4_7 [ -0 -1 0 0 ] [ -0 0 -1 0 ] -0 1 1 +( 0 384 384 ) ( 512 128 384 ) ( 512 384 384 ) city4_7 [ 0 1 0 0 ] [ 1 0 0 0 ] -0 1 1 +} +// brush 1 +{ +( 512 384 384 ) ( 512 128 384 ) ( 0 384 384 ) city2_1 [ 0 1 0 0 ] [ 1 0 0 0 ] -0 1 1 +( 512 640 384 ) ( 0 640 384 ) ( 512 640 0 ) city2_1 [ -1 0 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 512 384 384 ) ( 512 384 0 ) ( 512 128 384 ) city2_1 [ 0 1 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 0 128 0 ) ( 512 128 0 ) ( 0 384 0 ) city2_1 [ 0 1 0 0 ] [ -1 0 0 0 ] -0 1 1 +( 0 128 0 ) ( 0 384 0 ) ( 0 128 384 ) city2_1 [ -0 -1 0 0 ] [ -0 0 -1 0 ] -0 1 1 +( 512 512 0 ) ( 0 512 384 ) ( 512 512 384 ) city2_1 [ 1 -0 -0 0 ] [ 0 0 -1 0 ] -0 1 1 +} +// brush 2 +{ +( 512 384 384 ) ( 512 128 384 ) ( 0 384 384 ) city2_1 [ 0 1 0 0 ] [ 1 0 0 0 ] -0 1 1 +( 512 512 384 ) ( 0 512 384 ) ( 512 512 0 ) city2_1 [ -1 0 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 640 384 384 ) ( 640 384 0 ) ( 640 128 384 ) city2_1 [ 0 1 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 0 128 0 ) ( 512 128 0 ) ( 0 384 0 ) city2_1 [ 0 1 0 0 ] [ -1 0 0 0 ] -0 1 1 +( 0 0 0 ) ( 0 0 384 ) ( 512 0 0 ) city2_1 [ 1 -0 -0 0 ] [ -0 -0 -1 0 ] -0 1 1 +( 512 128 384 ) ( 512 384 0 ) ( 512 384 384 ) city2_1 [ -0 -1 -0 0 ] [ 0 0 -1 0 ] -0 1 1 +} +// brush 3 +{ +( 512 512 384 ) ( 0 512 384 ) ( 512 512 0 ) city4_7 [ -1 0 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 512 384 384 ) ( 512 384 0 ) ( 512 128 384 ) city4_7 [ 0 1 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 0 128 -128 ) ( 512 128 -128 ) ( 0 384 -128 ) city4_7 [ 0 1 0 0 ] [ -1 0 0 0 ] -0 1 1 +( 0 0 0 ) ( 0 0 384 ) ( 512 0 0 ) city4_7 [ 1 -0 -0 0 ] [ -0 -0 -1 0 ] -0 1 1 +( 0 128 0 ) ( 0 384 0 ) ( 0 128 384 ) city4_7 [ -0 -1 0 0 ] [ -0 0 -1 0 ] -0 1 1 +( 0 384 0 ) ( 512 128 0 ) ( 0 128 0 ) city4_7 [ 0 1 0 0 ] [ 1 0 0 0 ] -0 1 1 +} +// brush 4 +{ +( 512 384 384 ) ( 512 128 384 ) ( 0 384 384 ) city2_1 [ 0 1 0 0 ] [ 1 0 0 0 ] -0 1 1 +( 512 384 384 ) ( 512 384 0 ) ( 512 128 384 ) city2_1 [ 0 1 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 0 128 0 ) ( 512 128 0 ) ( 0 384 0 ) city2_1 [ 0 1 0 0 ] [ -1 0 0 0 ] -0 1 1 +( 0 -128 0 ) ( 0 -128 384 ) ( 512 -128 0 ) city2_1 [ 1 -0 -0 0 ] [ -0 -0 -1 0 ] -0 1 1 +( 0 128 0 ) ( 0 384 0 ) ( 0 128 384 ) city2_1 [ -0 -1 0 0 ] [ -0 0 -1 0 ] -0 1 1 +( 512 0 0 ) ( 0 0 384 ) ( 0 0 0 ) city2_1 [ -1 -0 -0 0 ] [ 0 0 -1 0 ] -0 1 1 +} +// brush 5 +{ +( 512 384 384 ) ( 512 128 384 ) ( 0 384 384 ) city2_1 [ 0 1 0 0 ] [ 1 0 0 0 ] -0 1 1 +( 512 512 384 ) ( 0 512 384 ) ( 512 512 0 ) city2_1 [ -1 0 -0 0 ] [ 0 -0 -1 0 ] -0 1 1 +( 0 128 0 ) ( 512 128 0 ) ( 0 384 0 ) city2_1 [ 0 1 0 0 ] [ -1 0 0 0 ] -0 1 1 +( 0 0 0 ) ( 0 0 384 ) ( 512 0 0 ) city2_1 [ 1 -0 -0 0 ] [ -0 -0 -1 0 ] -0 1 1 +( -128 128 0 ) ( -128 384 0 ) ( -128 128 384 ) city2_1 [ -0 -1 0 0 ] [ -0 0 -1 0 ] -0 1 1 +( 0 128 384 ) ( 0 384 0 ) ( 0 128 0 ) city2_1 [ -0 1 -0 0 ] [ 0 0 -1 0 ] -0 1 1 +} +// brush 6 +{ +( 512 512 64 ) ( 512 448 64 ) ( 0 512 64 ) city5_4 [ -1 0 0 0 ] [ 0 1 0 0 ] -0 1 1 +( 512 512 64 ) ( 0 512 64 ) ( 512 512 0 ) city5_4 [ 0 -0.0000000342 1 0.0000328594 ] [ -1 0 0 0 ] -0 0.9999998808 1 +( 512 512 64 ) ( 512 512 0 ) ( 512 448 64 ) city5_4 [ -1 0 0 0 ] [ 0 0 -1 0 ] -0 1 1 +( 0 448 0 ) ( 512 448 0 ) ( 0 512 0 ) city5_4 [ -1 0 0 0 ] [ 0 -1 0 -0 ] -0 1 1 +( 0 448 0 ) ( 0 448 64 ) ( 512 448 0 ) city5_4 [ 0 1 0 0 ] [ 0 0 -1 0 ] -0 1 1 +( 0 448 0 ) ( 0 512 0 ) ( 0 448 64 ) city5_4 [ 1 0 0 0 ] [ 0 0 -1 0 ] -0 1 1 +} +} +// entity 1 +{ +"classname" "info_player_start" +"origin" "96 96 32" +"angle" "90" +} +// entity 2 +{ +"classname" "light_globe" +"origin" "256 256 192" +}