diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-10-11 08:36:31 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-10-11 08:36:31 +0100 |
| commit | 06af9ce6de2aa4748a81ac3f7a478282000d4b63 (patch) | |
| tree | d6e3464bd99a09476c1711785e31f63ea8af6cff | |
| parent | eb1709c8e452ed4a56c94d3dc86042aa4caad0e8 (diff) | |
| download | data-service-06af9ce6de2aa4748a81ac3f7a478282000d4b63.tar data-service-06af9ce6de2aa4748a81ac3f7a478282000d4b63.tar.gz | |
Fix the environment variables in the check-with-tmp-database target
So that they're actually set for sqitch.
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index a2d1bfb..3425b6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,10 +55,10 @@ check-with-tmp-database: $(eval GUIX_DATA_SERVICE_DATABASE_URI := $(patsubst postgresql:///test%,postgresql://guix_data_service@localhost/guix_data_service_test%,$(URI))) psql --no-psqlrc "$(URI)" --command="CREATE USER guix_data_service" psql --no-psqlrc "$(URI)" --command="CREATE DATABASE guix_data_service_test WITH OWNER guix_data_service" - sqitch deploy --target="$(GUIX_DATA_SERVICE_DATABASE_URI)" # Set TZ and SQITCH_USER_CONFIG to avoid Sqitch tripping up in a minimal # environment, like a Guix package - TZ=UTC SQITCH_USER_CONFIG=/dev/null GUIX_DATA_SERVICE_DATABASE_URI="$(GUIX_DATA_SERVICE_DATABASE_URI)" make check + TZ=UTC SQITCH_USER_CONFIG=/dev/null sqitch deploy --target="$(GUIX_DATA_SERVICE_DATABASE_URI)" + GUIX_DATA_SERVICE_DATABASE_URI="$(GUIX_DATA_SERVICE_DATABASE_URI)" make check pg_tmp stop -w 1 -d "$(TMP_DATABASE)" SOURCES = \ |