summaryrefslogtreecommitdiffstats
path: root/postgresql-tests/tasks/initdb_old/runtest.sh
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2014-10-24 14:29:35 +0200
committerPavel Raiskup <praiskup@redhat.com>2014-10-24 14:29:35 +0200
commit2a6faa0853239377f191cdd72efc60f1df684ebd (patch)
tree2c8180a86ee2a289c6d8a6ff37b764624352af2f /postgresql-tests/tasks/initdb_old/runtest.sh
parentf9ec27bd843e40f89ace7705a075e938aa3a9409 (diff)
downloadpostgresql-setup-tests-2a6faa0853239377f191cdd72efc60f1df684ebd.tar.gz
postgresql-setup-tests-2a6faa0853239377f191cdd72efc60f1df684ebd.tar.xz
postgresql-setup-tests-2a6faa0853239377f191cdd72efc60f1df684ebd.zip
tester/run: better define API
Define test return values and its calling. Do not split the testcase into configuration and running script, rather use one file and wrap the script by run() method. This is still very easy to run without running whole testsuite. * tester/run (DTF_RESULT_*): Return values API. (run): Rename to run_test. Make the function more readable, don't generate xml results (not yet used anyway). * postgresql-tests/config.sh: Do not source the per-testsuite library directly as the configuration script config.h is sourced even by 'run' script itself for --dist option (for that action we actually do not need per-testsuite libraries). * postgresql-tests/tasks/initdb/runtest.sh: New API used. * postgresql-tests/tasks/initdb_old/runtest.sh: Likewise. * postgresql-tests/tasks/upgrade-basic/runtest.sh: Likewise. * postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh: Likewise. * postgresql-tests/tasks/upgrade-basic/config.sh: Remove. * postgresql-tests/tasks/initdb/config.sh: Remove. * postgresql-tests/tasks/initdb_old/config.sh: Remove. * postgresql-tests/tasks/upgrade-utf8-syntax/config.sh: Remove.
Diffstat (limited to 'postgresql-tests/tasks/initdb_old/runtest.sh')
-rw-r--r--[-rwxr-xr-x]postgresql-tests/tasks/initdb_old/runtest.sh18
1 files changed, 13 insertions, 5 deletions
diff --git a/postgresql-tests/tasks/initdb_old/runtest.sh b/postgresql-tests/tasks/initdb_old/runtest.sh
index 6a8d63c..1cd77f4 100755..100644
--- a/postgresql-tests/tasks/initdb_old/runtest.sh
+++ b/postgresql-tests/tasks/initdb_old/runtest.sh
@@ -1,5 +1,13 @@
-dtf_postgresql_test_init
-rlRun "postgresql-setup initdb"
-rlServiceStart postgresql
-dtf_postgresql_check_started
-dtf_postgresql_test_finish
+export DTF_TEST_ID="initdb-old-syntax"
+export DTF_TEST_DESCRIPTION="\
+Check that the old syntax 'postgresql-setup initdb' works together with
+following 'service start postgresql'."
+
+run()
+{
+ dtf_postgresql_test_init
+ rlRun "postgresql-setup initdb"
+ rlServiceStart postgresql
+ dtf_postgresql_check_started
+ dtf_postgresql_test_finish
+}