Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit db6d989

Browse files
committed
Generate a locale-agnostic initdb template
Fixup for 252dcb3. 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
1 parent 63956be commit db6d989

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -3107,7 +3107,7 @@ sys.exit(sp.returncode)
31073107
''',
31083108
test_initdb_template,
31093109
temp_install_bindir / 'initdb',
3110-
'-A', 'trust', '-N', '--no-instructions'
3110+
'-A', 'trust', '-N', '--no-instructions', '--no-locale'
31113111
],
31123112
priority: setup_tests_priority - 1,
31133113
timeout: 300,

src/Makefile.global.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ ifeq ($(MAKELEVEL),0)
425425
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
426426
$(MAKE) -j1 $(if $(CHECKPREP_TOP),-C $(CHECKPREP_TOP),) checkprep >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
427427

428-
$(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
428+
$(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
429429
endif
430430
endif
431431
endif

0 commit comments

Comments
 (0)