tests: Drop smoke.out, actofgod.out

Uninteresting since commit 9ca3fa9, v4.3.32.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/tests/actofgod-test b/tests/actofgod-test
index 169c10096a52d03711f60ebb24c48198b0c40de4..93b2b2062be7f79f28453ba9c23521f910450b42 100755 (executable)
--- a/tests/actofgod-test
+++ b/tests/actofgod-test
@@ -29,10 +29,8 @@ WORLD_X 24
 WORLD_Y 16
 EOF
 
 WORLD_Y 16
 EOF
 

-exec 3>sandbox/actofgod.out
-

 # Create world, hide creation output
 # 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
 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
 
 # Stop server
 stop_server
 

-exec 3>&-
-

 src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/actofgod.xdump
 
 # Test completed; compare results
 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 (file)
index cfc3a1a..0000000
--- 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 4113ff21b14b68ddc08b8fbffb66b4d82c90e3c3..c5b0d3768b0bc5c545463874a3b657502e232360 100755 (executable)
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -25,10 +25,8 @@ fi
 
 create_sandbox
 
 
 create_sandbox
 

-exec 3>sandbox/smoke.out
-

 # Create world and start server
 # 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
 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
     t="${i##*/}"
     if [ "$need_update" ]
     then

-       echo "Update Turn $t starting" >&3

        src/client/empire POGO peter <<EOF >/dev/null
 power new
 report *
        src/client/empire POGO peter <<EOF >/dev/null
 power new
 report *


@@ -49,18 +46,15 @@ comm * ?own#0
 reso * ?own#0
 force
 EOF
 reso * ?own#0
 force
 EOF

-       echo "Update Turn $t completed successfully" >&3

     fi
     for j in "$i"/*
     do
        p="${j##*/}"
     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
        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
     done
     need_update=y
 done


@@ -68,9 +62,7 @@ done
 # Stop server
 stop_server
 
 # Stop server
 stop_server
 

-exec 3>&-
-

 src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/smoke.xdump
 
 # Smoke test completed; compare results
 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 (file)
index ea7219a..0000000
--- 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