From ab913d73f9298602a03824b3c19aaea1246d18b2 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 8 Jan 2014 21:45:08 +0100 Subject: [PATCH] tests: Rename final xdump files to final.xdump The other test output files have fixed names, and having just one with a name that varies with the test name complicates things with no gain. Signed-off-by: Markus Armbruster --- tests/actofgod-test | 2 +- tests/actofgod/{actofgod.xdump => final.xdump} | 0 tests/fairland-test | 4 ++-- tests/fairland/{fairland.xdump => final.xdump} | 0 tests/files-test | 4 ++-- tests/files/{files.xdump => final.xdump} | 0 tests/fire-test | 2 +- tests/fire/{fire.xdump => final.xdump} | 0 tests/smoke-test | 2 +- tests/smoke/{smoke.xdump => final.xdump} | 0 tests/test-common.sh | 2 +- 11 files changed, 8 insertions(+), 8 deletions(-) rename tests/actofgod/{actofgod.xdump => final.xdump} (100%) rename tests/fairland/{fairland.xdump => final.xdump} (100%) rename tests/files/{files.xdump => final.xdump} (100%) rename tests/fire/{fire.xdump => final.xdump} (100%) rename tests/smoke/{smoke.xdump => final.xdump} (100%) diff --git a/tests/actofgod-test b/tests/actofgod-test index c12e5f62..e2184bdd 100755 --- a/tests/actofgod-test +++ b/tests/actofgod-test @@ -22,4 +22,4 @@ perl "$srcdir"/tests/actofgod/geninput.pl | feed_input POGO peter end_test -cmp_out var/empire/server.log var/empire/journal.log actofgod.xdump +cmp_out var/empire/server.log var/empire/journal.log final.xdump diff --git a/tests/actofgod/actofgod.xdump b/tests/actofgod/final.xdump similarity index 100% rename from tests/actofgod/actofgod.xdump rename to tests/actofgod/final.xdump diff --git a/tests/fairland-test b/tests/fairland-test index 6be2c986..9a7cfbc5 100755 --- a/tests/fairland-test +++ b/tests/fairland-test @@ -18,6 +18,6 @@ src/util/fairland -e sandbox/etc/empire/econfig -s sandbox/newcap_script -R 1 10 exec 3>&- -src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/fairland.xdump +src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump -cmp_out fairland.out fairland.xdump newcap_script +cmp_out fairland.out final.xdump newcap_script diff --git a/tests/fairland/fairland.xdump b/tests/fairland/final.xdump similarity index 100% rename from tests/fairland/fairland.xdump rename to tests/fairland/final.xdump diff --git a/tests/files-test b/tests/files-test index d83ade60..4be9990d 100755 --- a/tests/files-test +++ b/tests/files-test @@ -17,6 +17,6 @@ src/util/files -e sandbox/etc/empire/econfig -f >&3 exec 3>&- -src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/files.xdump +src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump -cmp_out files.out files.xdump +cmp_out files.out final.xdump diff --git a/tests/files/files.xdump b/tests/files/final.xdump similarity index 100% rename from tests/files/files.xdump rename to tests/files/final.xdump diff --git a/tests/fire-test b/tests/fire-test index 9d711ad3..d2f9bb1d 100755 --- a/tests/fire-test +++ b/tests/fire-test @@ -20,4 +20,4 @@ begin_test "$srcdir"/tests/fire/init_script feed_dir "$srcdir"/tests/fire end_test -cmp_out var/empire/server.log var/empire/journal.log fire.xdump +cmp_out var/empire/server.log var/empire/journal.log final.xdump diff --git a/tests/fire/fire.xdump b/tests/fire/final.xdump similarity index 100% rename from tests/fire/fire.xdump rename to tests/fire/final.xdump diff --git a/tests/smoke-test b/tests/smoke-test index d8f3f96a..1308b2cb 100755 --- a/tests/smoke-test +++ b/tests/smoke-test @@ -18,4 +18,4 @@ feed_dir "$srcdir"/tests/smoke end_test -cmp_out var/empire/server.log var/empire/journal.log smoke.xdump +cmp_out var/empire/server.log var/empire/journal.log final.xdump diff --git a/tests/smoke/smoke.xdump b/tests/smoke/final.xdump similarity index 100% rename from tests/smoke/smoke.xdump rename to tests/smoke/final.xdump diff --git a/tests/test-common.sh b/tests/test-common.sh index 506d69b5..72edb3d7 100644 --- a/tests/test-common.sh +++ b/tests/test-common.sh @@ -148,7 +148,7 @@ begin_test() end_test () { stop_server - src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/$test.xdump + src/util/empdump -e sandbox/etc/empire/econfig -x >sandbox/final.xdump } cmp_out()