diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2023-08-29 18:06:55 +0200 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2023-08-29 18:06:55 +0200 |
| commit | db6d9891e8e4405f10d9b0bba1ebb6c51c3ab059 (patch) | |
| tree | 3f5a074fca11525d4a4b39f43df4b24083970569 | |
| parent | 63956bed7b10fb3bb5fe3f74250a33c9e226a921 (diff) | |
| download | postgresql-db6d9891e8e4405f10d9b0bba1ebb6c51c3ab059.tar.gz postgresql-db6d9891e8e4405f10d9b0bba1ebb6c51c3ab059.zip | |
Generate a locale-agnostic initdb template
Fixup for 252dcb32397f.
Without this, the "template" data directory created in the initial test
steps uses a non-C locale, upsetting numerous tests that rely on parsing
English error messages.
Discussion: https://postgr.es/m/CAFj8pRB=XVWC0orWu0FbjrmyOpAMLqJiau80YyQOYQPfMj8Xxw@mail.gmail.com
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/Makefile.global.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 8b2b521a013..5422885b0a2 100644 --- a/meson.build +++ b/meson.build @@ -3107,7 +3107,7 @@ sys.exit(sp.returncode) ''', test_initdb_template, temp_install_bindir / 'initdb', - '-A', 'trust', '-N', '--no-instructions' + '-A', 'trust', '-N', '--no-instructions', '--no-locale' ], priority: setup_tests_priority - 1, timeout: 300, diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 0b4ca0eb6ae..765b60db02e 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -425,7 +425,7 @@ ifeq ($(MAKELEVEL),0) $(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1 $(MAKE) -j1 $(if $(CHECKPREP_TOP),-C $(CHECKPREP_TOP),) checkprep >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1 - $(with_temp_install) initdb -A trust -N --no-instructions '$(abs_top_builddir)'/tmp_install/initdb-template >>'$(abs_top_builddir)'/tmp_install/log/initdb-template.log 2>&1 + $(with_temp_install) initdb -A trust -N --no-instructions --no-locale '$(abs_top_builddir)'/tmp_install/initdb-template >>'$(abs_top_builddir)'/tmp_install/log/initdb-template.log 2>&1 endif endif endif |