postgresql_pkg_tests.sh made a template

This makes the testing macros actually work for SCLs, too;  since
the script needs to enable the proper collection to make all the
binaries work.

* .gitignore: Ignore new product.
* configure.ac: Non-existing %scl means that %scl expands to
'%scl' string, not empty string.
* share/postgresql-setup/Makefile.inc: Generate
postgresql_pkg_tests.sh from postgresql_pkg_tests.sh.in.
* share/postgresql-setup/postgresql_pkg_tests.sh: Renamed to
share/postgresql-setup/postgresql_pkg_tests.sh.in.

Author: praiskup

.gitignore

@@ -18,6 +18,7 @@ Makefile.in
 missing
 macros.*postgresql*
 package.m4
+postgresql_pkg_tests.sh
 postgresql*-check-db-dir
 postgresql*-ctl
 postgresql*-new-systemd-unit

configure.ac

@@ -143,7 +143,7 @@ AC_ARG_WITH([scl], [Build against Software Collections RPM], [scl_enabled_build=
 if $scl_enabled_build; then
     AC_MSG_CHECKING([which SCL to build against])
     SCL=`rpm --eval %scl`
-    if test x"$SCL" = x; then
+    if test x"$SCL" = x%scl; then
         AC_MSG_ERROR([Macro %scl undefined, please install COLLECTION-build subpackage])
     else
         SCL_SHELL_WRAPPER="$SCL_BINDIR/$SCL_BINARY enable $SCL -- "

share/postgresql-setup/Makefile.inc

@@ -3,18 +3,20 @@ lib_in		= $(srcdir)/$(lib).in
 
 pkg_tests_base	= postgresql_pkg_tests.sh
 pkg_tests	= %D%/$(pkg_tests_base)
+pkg_tests_in	= %D%/$(pkg_tests_base).in
 
 _AX_TEXT_ADDITIONAL_SED_SUBSTITUTIONS += \
 		-e 's|@PKG_TESTS_LIB@|$(rawpkgdatadir)/$(pkg_tests_base)|'
 
 rawdata_generated_files = \
-	$(lib)
+	$(lib) \
+	$(pkg_tests)
 
 rawdata_template_files = \
-	$(lib_in)
+	$(lib_in) \
+	$(pkg_tests_in)
 
-rawdata_static_files = \
-	$(pkg_tests)
+rawdata_static_files =
 
 rawpkgdata_DATA = \
 	$(rawdata_generated_files) \
@@ -26,4 +28,7 @@ EXTRA_DIST += $(rawdata_static_files) $(rawdata_template_files)
 $(lib): $(lib_in) $(text_tpl_deps)
 	$(text_tpl_gen)
 
+$(pkg_tests): $(pkg_tests_in)
+	$(text_tpl_gen)
+
 # vim: ft=automake noet

…postgresql-setup/postgresql_pkg_tests.sh …tgresql-setup/postgresql_pkg_tests.sh.inshare/postgresql-setup/postgresql_pkg_tests.sh renamed to share/postgresql-setup/postgresql_pkg_tests.sh.in share/postgresql-setup/postgresql_pkg_tests.sh renamed to share/postgresql-setup/postgresql_pkg_tests.sh.in

@@ -25,6 +25,8 @@
 export PGPORT=$PGTESTS_PORT
 export PGHOST=$PGTESTS_SOCKETDIR
 
+@SCL_SOURCE@
+
 warning ()
 {
     echo >&2 " ! $*"