From d01c30ea9b4bd205b4ad446e9532ec0cb5d5677c Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 19 Sep 2021 18:46:40 -0600 Subject: [PATCH] ci: run vis single threaded, refresh expected hashes --- testmaps/automatated_tests.sh | 3 ++- testmaps/qbsp-vis-light.sha256sum | 14 +++++++------- testmaps/qbsp-vis.sha256sum | 14 +++++++------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/testmaps/automatated_tests.sh b/testmaps/automatated_tests.sh index 309fe4e8..bd4a5745 100755 --- a/testmaps/automatated_tests.sh +++ b/testmaps/automatated_tests.sh @@ -58,9 +58,10 @@ else fi # now run vis +# FIXME: vis output is nondeterministic when run with multiple threads! for bsp in ${HASH_CHECK_BSPS}; do - vis -nostate ${bsp} || exit 1 + vis -nostate -threads 1 ${bsp} || exit 1 done if [[ $UPDATE_HASHES -ne 0 ]]; then diff --git a/testmaps/qbsp-vis-light.sha256sum b/testmaps/qbsp-vis-light.sha256sum index c1a7b384..50bc3db6 100644 --- a/testmaps/qbsp-vis-light.sha256sum +++ b/testmaps/qbsp-vis-light.sha256sum @@ -1,7 +1,7 @@ -a46bc18dcd32ca85aa72d72c818be70f211076fc39abb64a52bc09915b9a78d3 *e1m1-bsp29.bsp -9c74e953aca788d6c0b9453b0ebdd10896effdbd003ad23919555998cbea1358 *e1m1-bsp2.bsp -a5c2bea990084da30673c589cea41deeae1527d2cc3ae65beb247acb06624130 *e1m1-2psb.bsp -3cd6fcba96cfc7d289a995d6a9fea5b1e25096f10c896ef5a3b6b49dadc2fe4f *e1m1-hexen2.bsp -9696cad6ffe7ca8e2fae9cbb127d10097fd867df784dce7f5e296b4eed721413 *e1m1-hexen2-bsp2.bsp -0266f39c56568eec2be01504031c95372c17b7d5f42e72b7af47b1afbb244199 *e1m1-hexen2-2psb.bsp -f4ce4140b00163ac2120a0c768c5903301c672642816915a3702afaad30991fb *e1m1-hlbsp.bsp +d5da8e86c8f2f1c8e78ce5bfacb21c59bdc98cd91f6f14172a5fdd0020e4dd4d *e1m1-bsp29.bsp +361c32951113f1afc98e61d3bc7b7f2eaa8dd67ebfbc15944257b86099981635 *e1m1-bsp2.bsp +00ecf1affe4d77eba7090a4a8613e5aa0037d50cf374365c80a8a66e55c03b46 *e1m1-2psb.bsp +a646ed92ca0d630ecf654491cef06257aca793dc6f0e67df3b3144022421585f *e1m1-hexen2.bsp +cb12dad4278373ef86214ec3907967de054aab8344e965d726e7ac5ea4eda221 *e1m1-hexen2-bsp2.bsp +7dc19487e2659732ec714395d7a7c484e89415eb655c405453b923e29384f36d *e1m1-hexen2-2psb.bsp +84209486441bcb21e9c2d7f5dee840a6bf074311fd773b417f03bd187997e880 *e1m1-hlbsp.bsp diff --git a/testmaps/qbsp-vis.sha256sum b/testmaps/qbsp-vis.sha256sum index 8372ca0d..1a511f8a 100644 --- a/testmaps/qbsp-vis.sha256sum +++ b/testmaps/qbsp-vis.sha256sum @@ -1,7 +1,7 @@ -03e940ac2ce95a1837c129dd7f234ee6e84b374bd460c75f63a66cd6a3060595 *e1m1-bsp29.bsp -866aa5d3060349905c24ada53e9240a4661a93d8370b1113618b2b9855a62054 *e1m1-bsp2.bsp -2f2afe85b101cc9670027ff96d7b660a0d104adf90fc7510ad7d9b750d9e621a *e1m1-2psb.bsp -bdd9048ea393999c3bf69b31c20b67f3a59027cf165201a6cd10abe3d14e35d4 *e1m1-hexen2.bsp -79e05843fa11164f8081120b2c7367acc1f67dcc20bdcaf3b91034f619ad5314 *e1m1-hexen2-bsp2.bsp -bb0c8abc8f41b837f6f190c443f2f1c75abfb3b2709c44f2a611cd0278b69520 *e1m1-hexen2-2psb.bsp -4971d6da31721c0eba9ec84f933202f12ea43ec6bf8e642a33a20dfae64d7366 *e1m1-hlbsp.bsp +c9683e945bb01528a768653cdb79584dfbc8be6f76b712cbf0d24482a4ae3cc3 *e1m1-bsp29.bsp +a8024b07d48abc0553ff3628d6d4cb62138f67808b425b833e5643068231c2e4 *e1m1-bsp2.bsp +cb11d4f40d92c9d349fd11f9e4901e9cd9aa82db9971181a615c197f75f4b4a6 *e1m1-2psb.bsp +f5656ae5a98b4044568e70a411afe2b37cae41c14f7262f26be2aa45aebc3672 *e1m1-hexen2.bsp +4e0fec87702736481d08d67366f300bf351944f0ebcd4daafa56cbfb2f509893 *e1m1-hexen2-bsp2.bsp +a5eb5b451baab8db48a141285479669656010fc7d3945e30672d609169b040e5 *e1m1-hexen2-2psb.bsp +ecf7a82cfad86c3b8a330645233c17011f77b8fef844130ac85dd6e8972eea8f *e1m1-hlbsp.bsp