summaryrefslogtreecommitdiffstats
path: root/postgresql-tests/tasks/upgrade-utf8-syntax
diff options
context:
space:
mode:
Diffstat (limited to 'postgresql-tests/tasks/upgrade-utf8-syntax')
-rw-r--r--postgresql-tests/tasks/upgrade-utf8-syntax/config.sh3
-rw-r--r--postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh29
2 files changed, 18 insertions, 14 deletions
diff --git a/postgresql-tests/tasks/upgrade-utf8-syntax/config.sh b/postgresql-tests/tasks/upgrade-utf8-syntax/config.sh
deleted file mode 100644
index bed95ad..0000000
--- a/postgresql-tests/tasks/upgrade-utf8-syntax/config.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export DTF_TEST_ID="basic-locale-utf8-syntax"
-export DTF_TEST_DESCRIPTION="Check postgresql-setup --upgrade works even when \
-the system locale changed from xx_XX.utf8 to xx_XX.UTF-8"
diff --git a/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh b/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh
index cc8f8c4..c14a34e 100644
--- a/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh
+++ b/postgresql-tests/tasks/upgrade-utf8-syntax/runtest.sh
@@ -1,15 +1,22 @@
-dtf_postgresql_test_init
+export DTF_TEST_ID="basic-locale-utf8-syntax"
+export DTF_TEST_DESCRIPTION="Check postgresql-setup --upgrade works even when \
+the system locale changed from xx_XX.utf8 to xx_XX.UTF-8"
-dtf_postgresql_cb_upgrade_select()
+run()
{
- if rlIsFedora 20 21 22; then
- cat
- else
- cat >/dev/null
- fi
-}
+ dtf_postgresql_test_init
+
+ dtf_postgresql_cb_upgrade_select()
+ {
+ if rlIsFedora 20 21 22; then
+ cat
+ else
+ cat >/dev/null
+ fi
+ }
-dtf_postgresql_upgrade_tour "$(dtf_postgresql_data_mirror)" locale-utf-typo.tar.gz
-rlAssert0 "test wrapper should finish successfully" $?
+ dtf_postgresql_upgrade_tour "$(dtf_postgresql_data_mirror)" locale-utf-typo.tar.gz
+ rlAssert0 "test wrapper should finish successfully" $?
-dtf_postgresql_test_finish
+ dtf_postgresql_test_finish
+}