From 5de1e5ec5f7062e6f1b0dd5ba5e3f4e5c1af8e20 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 28 Dec 2013 16:32:38 +0100 Subject: [PATCH] tests: Drop smoke.out, actofgod.out Uninteresting since commit 9ca3fa9, v4.3.32. Signed-off-by: Markus Armbruster --- tests/actofgod-test | 8 +-- tests/actofgod/actofgod.out | 1 - tests/smoke-test | 12 +--- tests/smoke/smoke.out | 127 ------------------------------------ 4 files changed, 4 insertions(+), 144 deletions(-) delete mode 100644 tests/actofgod/actofgod.out delete mode 100644 tests/smoke/smoke.out diff --git a/tests/actofgod-test b/tests/actofgod-test index 169c1009..93b2b206 100755 --- a/tests/actofgod-test +++ b/tests/actofgod-test @@ -29,10 +29,8 @@ WORLD_X 24 WORLD_Y 16 EOF -exec 3>sandbox/actofgod.out - # Create world, hide creation output -src/util/files -e sandbox/etc/empire/econfig -f >&3 +src/util/files -e sandbox/etc/empire/econfig -f >/dev/null cp -r sandbox/var/empire/tel sandbox/var/empire/empty.tel start_server src/client/empire POGO peter <"$srcdir"/tests/actofgod/init_script >/dev/null @@ -51,9 +49,7 @@ perl "$srcdir"/tests/actofgod/geninput.pl | src/client/empire POGO peter >/dev/n # Stop server stop_server -exec 3>&- - src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/actofgod.xdump # Test completed; compare results -cmp_out actofgod.out var/empire/server.log var/empire/journal.log actofgod.xdump +cmp_out var/empire/server.log var/empire/journal.log actofgod.xdump diff --git a/tests/actofgod/actofgod.out b/tests/actofgod/actofgod.out deleted file mode 100644 index cfc3a1ab..00000000 --- a/tests/actofgod/actofgod.out +++ /dev/null @@ -1 +0,0 @@ -All praise to POGO! diff --git a/tests/smoke-test b/tests/smoke-test index 4113ff21..c5b0d376 100755 --- a/tests/smoke-test +++ b/tests/smoke-test @@ -25,10 +25,8 @@ fi create_sandbox -exec 3>sandbox/smoke.out - # Create world and start server -src/util/files -e sandbox/etc/empire/econfig -f >&3 +src/util/files -e sandbox/etc/empire/econfig -f >/dev/null src/util/empdump -e sandbox/etc/empire/econfig -i "$srcdir"/tests/smoke/fairland.xdump start_server src/client/empire POGO peter <"$srcdir"/tests/smoke/newcap_script >/dev/null @@ -40,7 +38,6 @@ do t="${i##*/}" if [ "$need_update" ] then - echo "Update Turn $t starting" >&3 src/client/empire POGO peter </dev/null power new report * @@ -49,18 +46,15 @@ comm * ?own#0 reso * ?own#0 force EOF - echo "Update Turn $t completed successfully" >&3 fi for j in "$i"/* do p="${j##*/}" - echo "Player $p Turn $t starting" >&3 if [ $p -eq 0 ] then c=POGO r=peter else c="${p#0}"; r="$c" fi src/client/empire "$c" "$r" <$j >/dev/null - echo "Player $p Turn $t completed successfully" >&3 done need_update=y done @@ -68,9 +62,7 @@ done # Stop server stop_server -exec 3>&- - src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/smoke.xdump # Smoke test completed; compare results -cmp_out smoke.out var/empire/server.log var/empire/journal.log smoke.xdump +cmp_out var/empire/server.log var/empire/journal.log smoke.xdump diff --git a/tests/smoke/smoke.out b/tests/smoke/smoke.out deleted file mode 100644 index ea7219ae..00000000 --- a/tests/smoke/smoke.out +++ /dev/null @@ -1,127 +0,0 @@ -All praise to POGO! -Player 00 Turn 00 starting -Player 00 Turn 00 completed successfully -Player 01 Turn 00 starting -Player 01 Turn 00 completed successfully -Player 02 Turn 00 starting -Player 02 Turn 00 completed successfully -Player 03 Turn 00 starting -Player 03 Turn 00 completed successfully -Player 04 Turn 00 starting -Player 04 Turn 00 completed successfully -Player 05 Turn 00 starting -Player 05 Turn 00 completed successfully -Player 06 Turn 00 starting -Player 06 Turn 00 completed successfully -Player 07 Turn 00 starting -Player 07 Turn 00 completed successfully -Player 08 Turn 00 starting -Player 08 Turn 00 completed successfully -Player 09 Turn 00 starting -Player 09 Turn 00 completed successfully -Player 10 Turn 00 starting -Player 10 Turn 00 completed successfully -Update Turn 01 starting -Update Turn 01 completed successfully -Player 01 Turn 01 starting -Player 01 Turn 01 completed successfully -Update Turn 02 starting -Update Turn 02 completed successfully -Player 01 Turn 02 starting -Player 01 Turn 02 completed successfully -Update Turn 03 starting -Update Turn 03 completed successfully -Player 01 Turn 03 starting -Player 01 Turn 03 completed successfully -Player 08 Turn 03 starting -Player 08 Turn 03 completed successfully -Update Turn 04 starting -Update Turn 04 completed successfully -Player 01 Turn 04 starting -Player 01 Turn 04 completed successfully -Player 08 Turn 04 starting -Player 08 Turn 04 completed successfully -Update Turn 05 starting -Update Turn 05 completed successfully -Player 01 Turn 05 starting -Player 01 Turn 05 completed successfully -Update Turn 06 starting -Update Turn 06 completed successfully -Player 01 Turn 06 starting -Player 01 Turn 06 completed successfully -Player 08 Turn 06 starting -Player 08 Turn 06 completed successfully -Update Turn 07 starting -Update Turn 07 completed successfully -Player 01 Turn 07 starting -Player 01 Turn 07 completed successfully -Player 08 Turn 07 starting -Player 08 Turn 07 completed successfully -Update Turn 08 starting -Update Turn 08 completed successfully -Player 01 Turn 08 starting -Player 01 Turn 08 completed successfully -Player 08 Turn 08 starting -Player 08 Turn 08 completed successfully -Update Turn 09 starting -Update Turn 09 completed successfully -Player 01 Turn 09 starting -Player 01 Turn 09 completed successfully -Player 08 Turn 09 starting -Player 08 Turn 09 completed successfully -Update Turn 10 starting -Update Turn 10 completed successfully -Player 01 Turn 10 starting -Player 01 Turn 10 completed successfully -Player 08 Turn 10 starting -Player 08 Turn 10 completed successfully -Update Turn 11 starting -Update Turn 11 completed successfully -Player 01 Turn 11 starting -Player 01 Turn 11 completed successfully -Player 08 Turn 11 starting -Player 08 Turn 11 completed successfully -Update Turn 12 starting -Update Turn 12 completed successfully -Player 01 Turn 12 starting -Player 01 Turn 12 completed successfully -Player 08 Turn 12 starting -Player 08 Turn 12 completed successfully -Update Turn 13 starting -Update Turn 13 completed successfully -Player 01 Turn 13 starting -Player 01 Turn 13 completed successfully -Player 02 Turn 13 starting -Player 02 Turn 13 completed successfully -Player 08 Turn 13 starting -Player 08 Turn 13 completed successfully -Update Turn 14 starting -Update Turn 14 completed successfully -Player 01 Turn 14 starting -Player 01 Turn 14 completed successfully -Player 02 Turn 14 starting -Player 02 Turn 14 completed successfully -Player 08 Turn 14 starting -Player 08 Turn 14 completed successfully -Update Turn 15 starting -Update Turn 15 completed successfully -Player 01 Turn 15 starting -Player 01 Turn 15 completed successfully -Player 02 Turn 15 starting -Player 02 Turn 15 completed successfully -Player 08 Turn 15 starting -Player 08 Turn 15 completed successfully -Update Turn 16 starting -Update Turn 16 completed successfully -Player 01 Turn 16 starting -Player 01 Turn 16 completed successfully -Player 02 Turn 16 starting -Player 02 Turn 16 completed successfully -Player 08 Turn 16 starting -Player 08 Turn 16 completed successfully -Update Turn 99 starting -Update Turn 99 completed successfully -Player 00 Turn 99 starting -Player 00 Turn 99 completed successfully -Player 01 Turn 99 starting -Player 01 Turn 99 completed successfully