diff options
Diffstat (limited to 'util/test_multiplayer.sh')
| -rwxr-xr-x | util/test_multiplayer.sh | 45 |
1 files changed, 14 insertions, 31 deletions
diff --git a/util/test_multiplayer.sh b/util/test_multiplayer.sh index 5ffc044e0..1fcf298e8 100755 --- a/util/test_multiplayer.sh +++ b/util/test_multiplayer.sh @@ -1,6 +1,6 @@ #!/bin/bash dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -gameid=devtest +gameid=${gameid:-devtest} minetest=$dir/../bin/minetest testspath=$dir/../tests conf_client1=$testspath/client1.conf @@ -23,50 +23,33 @@ gdbrun () { gdb -q -batch -ex 'set confirm off' -ex 'r' -ex 'bt' --args "$@" } -[ -e $minetest ] || { echo "executable $minetest missing"; exit 1; } +[ -e "$minetest" ] || { echo "executable $minetest missing"; exit 1; } -rm -rf $worldpath -mkdir -p $worldpath/worldmods/test +rm -rf "$worldpath" +mkdir -p "$worldpath/worldmods" -printf '%s\n' >$testspath/client1.conf \ +printf '%s\n' >"$testspath/client1.conf" \ video_driver=null name=client1 viewing_range=10 \ enable_{sound,minimap,shaders}=false -printf '%s\n' >$testspath/server.conf \ - max_block_send_distance=1 devtest_unittests_autostart=true +printf '%s\n' >"$testspath/server.conf" \ + max_block_send_distance=1 devtest_unittests_autostart=true \ + helper_mode=devtest -cat >$worldpath/worldmods/test/init.lua <<"LUA" -core.after(0, function() - io.close(io.open(core.get_worldpath() .. "/startup", "w")) -end) -local function callback(test_ok) - if not test_ok then - io.close(io.open(core.get_worldpath() .. "/test_failure", "w")) - end - io.close(io.open(core.get_worldpath() .. "/done", "w")) - core.request_shutdown("", false, 2) -end -if core.settings:get_bool("devtest_unittests_autostart") then - unittests.on_finished = callback -else - core.register_on_joinplayer(function() callback(true) end) -end -LUA -printf '%s\n' >$worldpath/worldmods/test/mod.conf \ - name=test optional_depends=unittests +ln -s "$dir/helper_mod" "$worldpath/worldmods/" echo "Starting server" -gdbrun $minetest --server --config $conf_server --world $worldpath --gameid $gameid 2>&1 | sed -u 's/^/(server) /' & -waitfor $worldpath/startup +gdbrun "$minetest" --server --config "$conf_server" --world "$worldpath" --gameid $gameid 2>&1 | sed -u 's/^/(server) /' & +waitfor "$worldpath/startup" echo "Starting client" -gdbrun $minetest --config $conf_client1 --go --address 127.0.0.1 2>&1 | sed -u 's/^/(client) /' & -waitfor $worldpath/done +gdbrun "$minetest" --config "$conf_client1" --go --address 127.0.0.1 2>&1 | sed -u 's/^/(client) /' & +waitfor "$worldpath/done" echo "Waiting for client and server to exit" wait -if [ -f $worldpath/test_failure ]; then +if [ -f "$worldpath/test_failure" ]; then echo "There were test failures." exit 1 fi |