From 98df0c8b79a964c94df0c7b731fe790073214eba Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 3 Oct 2014 14:44:34 +0200 Subject: tasks/initdb: fixes for f20 Older versions of postgresql-setup do not support --initdb option. * lib_pgsql.sh (dtf_postgresql_phase_cleanup): Do not fail when the data directory is not created by test. * tasks/initdb/runtest.sh: Avoid running this test on older RHEL/Fedora systems. --- tasks/initdb/runtest.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tasks/initdb') diff --git a/tasks/initdb/runtest.sh b/tasks/initdb/runtest.sh index 5a942ef..d5323bd 100755 --- a/tasks/initdb/runtest.sh +++ b/tasks/initdb/runtest.sh @@ -1,5 +1,11 @@ dtf_postgresql_test_init -rlRun "postgresql-setup --initdb" -rlServiceStart postgresql -dtf_postgresql_check_started +if rlIsFedora 18 19 20 || rlIsRHEL 5 6 7; then + # This syntaxe is not supported on oler systems. + : +else + rlRun "postgresql-setup --initdb" + rlServiceStart postgresql + dtf_postgresql_check_started +fi + dtf_postgresql_test_finish -- cgit