Skip to content

Commit 14e8e42

Browse files
committed
macros: the '&& cmd' ignores 'set -e'
* share/postgresql-setup/postgresql_pkg_tests.sh.in: Don't use 'cmd && cmd' statements in 'set -e' shell environment - in rpmbuild.
1 parent 1888a6a commit 14e8e42

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

share/postgresql-setup/postgresql_pkg_tests.sh.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ pgtests_start ()
9191
fi
9292
fi
9393
94-
__pgtests_initdb && __TRAP_ACTIONS="pgtests_cleanup $__TRAP_ACTIONS"
95-
__pgtests_start && __TRAP_ACTIONS="pgtests_stop $__TRAP_ACTIONS"
94+
__pgtests_initdb
95+
__TRAP_ACTIONS="pgtests_cleanup $__TRAP_ACTIONS"
96+
__pgtests_start
97+
__TRAP_ACTIONS="pgtests_stop $__TRAP_ACTIONS"
9698
__pgtests_create_admins_db
9799
98100
__pgtests_passwd "$PGTESTS_ADMIN" "$PGTESTS_ADMINPASS"

0 commit comments

Comments
 (0)