From 033b969edde62c84ee15b53972ee638150a28c90 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan <andrew@dunslane.net> Date: Sat, 15 Apr 2017 18:43:13 -0400 Subject: [PATCH] Make sure to run one initdb TAP test with no TZ set That way we make sure that initdb's time zone setting code is exercised. This doesn't add an extra test, it just alters an existing test. Discussion: <https://postgr.es/m/5807.1492229253@sss.pgh.pa.us> --- src/bin/initdb/t/001_initdb.pl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl index 372865d3f7a..11d05c4647a 100644 --- a/src/bin/initdb/t/001_initdb.pl +++ b/src/bin/initdb/t/001_initdb.pl @@ -34,8 +34,16 @@ command_fails( 'role names cannot begin with "pg_"'); mkdir $datadir; -command_ok([ 'initdb', '-N', '-T', 'german', '-X', $xlogdir, $datadir ], - 'successful creation'); +# make sure we run one successful test without a TZ setting so we test +# initdb's time zone setting code +{ + # delete local only works from perl 5.12, so use the older way to do this + local (%ENV) = %ENV; + delete $ENV{TZ}; + + command_ok([ 'initdb', '-N', '-T', 'german', '-X', $xlogdir, $datadir ], + 'successful creation'); +} command_ok([ 'initdb', '-S', $datadir ], 'sync only'); command_fails([ 'initdb', $datadir ], 'existing data directory'); -- GitLab