From 17d8c6f7adddad0b837b18d052ddb61248f9b4f7 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Wed, 6 Oct 2021 22:19:18 -0600 Subject: [PATCH] testmaps: also save + diff expected log output for the tiny test maps --- testmaps/automatated_tests.sh | 11 ++- .../qbsp_func_detail.bsp.qbsplog | 89 +++++++++++++++++++ ..._detail_illusionary_plus_water.bsp.qbsplog | 87 ++++++++++++++++++ 3 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 testmaps/reference_bsp_json/qbsp_func_detail.bsp.qbsplog create mode 100644 testmaps/reference_bsp_json/qbsp_func_detail_illusionary_plus_water.bsp.qbsplog diff --git a/testmaps/automatated_tests.sh b/testmaps/automatated_tests.sh index e2252e8e..2d692ea8 100755 --- a/testmaps/automatated_tests.sh +++ b/testmaps/automatated_tests.sh @@ -56,17 +56,22 @@ COMMIT_JSON_MAPS="qbsp_func_detail.bsp \ qbsp_func_detail_illusionary_plus_water.bsp" # smaller test maps for specific features/combinations -qbsp -noverbose qbsp_func_detail.map || exit 1 -qbsp -noverbose qbsp_func_detail_illusionary_plus_water.bsp || exit 1 - # check .json diff of COMMIT_JSON_MAPS for bsp in ${COMMIT_JSON_MAPS}; do + # save regular verbosity log to file, to avoid spamming the CI log + qbsp -nopercent ${bsp} &> ${bsp}.qbsplog || exit 1 + + # dump .bsp to .bsp.json bspinfo ${bsp} || exit 1 if [[ $UPDATE_HASHES -ne 0 ]]; then mkdir reference_bsp_json cp ${bsp}.json reference_bsp_json/${bsp}.json + cp ${bsp}.qbsplog reference_bsp_json/${bsp}.qbsplog else + echo "Diff of reference_bsp_json/${bsp}.qbsplog and ${bsp}.qbsplog:" + diff -U3 --strip-trailing-cr reference_bsp_json/${bsp}.qbsplog ${bsp}.qbsplog + echo "Diff of reference_bsp_json/${bsp}.json and ${bsp}.json:" diff -U3 --strip-trailing-cr reference_bsp_json/${bsp}.json ${bsp}.json || exit 1 fi diff --git a/testmaps/reference_bsp_json/qbsp_func_detail.bsp.qbsplog b/testmaps/reference_bsp_json/qbsp_func_detail.bsp.qbsplog new file mode 100644 index 00000000..7fee331a --- /dev/null +++ b/testmaps/reference_bsp_json/qbsp_func_detail.bsp.qbsplog @@ -0,0 +1,89 @@ +---- qbsp / ericw-tools v0.18.1-373-gca7002c ---- +Input file: qbsp_func_detail.map +Output file: qbsp_func_detail.bsp + +SetQdirFromPath: no "maps" in 'C:\Users\Eric\Documents\ericwtools-vcpkgtest\testmaps\/qbsp_func_detail.map' +---- LoadMapFile ---- +*** WARNING 06: No info_player_deathmatch entities in level + 48 faces + 8 brushes + 4 entities + 3 unique texnames + 36 texinfo + +Opened WAD: deprecated/free_wad.wad +Opened WAD: deprecated/fence.wad +Opened WAD: deprecated/origin.wad +Opened WAD: deprecated/hintskip.wad +Processing hull 0... +---- Brush_LoadEntity ---- + 7 brushes + 1 detail + 21 planes +---- CSGFaces ---- + 48 brushfaces + 53 csgfaces + 58 mergedfaces +---- SolidBSP ---- + 62 split nodes + 17 solid leafs + 45 empty leafs + 0 water leafs + 1 detail leafs + 0 detail illusionary leafs + 0 detail fence leafs + 0 illusionary visblocker leafs + 157 leaffaces + 146 nodefaces +---- Portalize ---- + 46 vis leafs + 46 vis clusters + 99 vis portals +---- FillOutside ---- + 37 outleafs +---- MergeAll ---- + 28 mergefaces +---- SolidBSP ---- + 17 split nodes + 9 solid leafs + 8 empty leafs + 0 water leafs + 1 detail leafs + 0 detail illusionary leafs + 0 detail fence leafs + 0 illusionary visblocker leafs + 70 leaffaces + 52 nodefaces +---- Portalize ---- + 8 vis leafs + 4 vis clusters + 5 vis portals +---- Tjunc ---- + 50 world edges + 164 edge points + 40 edges added by tjunctions + 0 faces added by tjunctions +---- MakeFaceEdges ---- +---- GrowRegions ---- +Processing hull 1... +Processing hull 2... +---- WriteBSPFile ---- +Writing qbsp_func_detail.bsp as BSP version Quake BSP +Wrote qbsp_func_detail.bsp + 1 models + 40 planes 800 + 68 vertexes 816 + 17 nodes 408 + 12 texinfos 480 + 46 faces 920 + 62 clipnodes 496 + 9 leafs 252 + 64 marksurfaces 128 + 113 edges 452 + 224 surfedges 896 + 6 textures 49228 + lightdata 0 + visdata 0 + entdata 320 + +0.048 seconds elapsed diff --git a/testmaps/reference_bsp_json/qbsp_func_detail_illusionary_plus_water.bsp.qbsplog b/testmaps/reference_bsp_json/qbsp_func_detail_illusionary_plus_water.bsp.qbsplog new file mode 100644 index 00000000..d4133303 --- /dev/null +++ b/testmaps/reference_bsp_json/qbsp_func_detail_illusionary_plus_water.bsp.qbsplog @@ -0,0 +1,87 @@ +---- qbsp / ericw-tools v0.18.1-373-gca7002c ---- +Input file: qbsp_func_detail_illusionary_plus_water.map +Output file: qbsp_func_detail_illusionary_plus_water.bsp + +SetQdirFromPath: no "maps" in 'C:\Users\Eric\Documents\ericwtools-vcpkgtest\testmaps\/qbsp_func_detail_illusionary_plus_water.map' +---- LoadMapFile ---- +*** WARNING 06: No info_player_deathmatch entities in level + 48 faces + 8 brushes + 4 entities + 4 unique texnames + 36 texinfo + +Opened WAD: deprecated/fence.wad +Opened WAD: deprecated/free_wad.wad +Processing hull 0... +---- Brush_LoadEntity ---- + 7 brushes + 1 detail illusionary + 18 planes +---- CSGFaces ---- + 48 brushfaces + 50 csgfaces + 60 mergedfaces +---- SolidBSP ---- + 34 split nodes + 6 solid leafs + 23 empty leafs + 5 water leafs + 0 detail leafs + 1 detail illusionary leafs + 0 detail fence leafs + 0 illusionary visblocker leafs + 84 leaffaces + 60 nodefaces +---- Portalize ---- + 29 vis leafs + 29 vis clusters + 56 vis portals +---- FillOutside ---- + 18 outleafs +---- MergeAll ---- + 30 mergefaces +---- SolidBSP ---- + 16 split nodes + 6 solid leafs + 5 empty leafs + 5 water leafs + 0 detail leafs + 1 detail illusionary leafs + 0 detail fence leafs + 0 illusionary visblocker leafs + 54 leaffaces + 30 nodefaces +---- Portalize ---- + 11 vis leafs + 2 vis clusters + 1 vis portals +---- Tjunc ---- + 32 world edges + 72 edge points + 0 edges added by tjunctions + 0 faces added by tjunctions +---- MakeFaceEdges ---- +---- GrowRegions ---- +Processing hull 1... +Processing hull 2... +---- WriteBSPFile ---- +Writing qbsp_func_detail_illusionary_plus_water.bsp as BSP version Quake BSP +Wrote qbsp_func_detail_illusionary_plus_water.bsp + 1 models + 23 planes 460 + 24 vertexes 288 + 16 nodes 384 + 9 texinfos 360 + 30 faces 600 + 12 clipnodes 96 + 12 leafs 336 + 54 marksurfaces 108 + 65 edges 260 + 120 surfedges 480 + 4 textures 38260 + lightdata 0 + visdata 0 + entdata 223 + +0.037 seconds elapsed