Skip to content

Commit 05b3007

Browse files
committed
.ci scripts: start test base with C locale to make some tests, which include server message in their output, pass
1 parent adb5255 commit 05b3007

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.ci/make_test_base

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ if os.access(datadir,os.R_OK):
1919
import shutil
2020
shutil.rmtree(datadir)
2121
os.mkdir(datadir)
22+
env=os.environ.copy()
23+
env["LANG"]="C"
2224
with open("initdb.log","w") as f:
23-
exitcode=subprocess.call(["initdb","-E","UTF8",datadir],stdout=f,stderr=subprocess.STDOUT)
25+
exitcode=subprocess.call(["initdb","-E","UTF8",datadir],env=env,stdout=f,stderr=subprocess.STDOUT)
2426
if exitcode:
2527
sys.exit(exitcode)
2628
# Collect extra config option
@@ -59,7 +61,7 @@ if addopts:
5961
for opt,value in addopts.items():
6062
print >> f,"%s=%s"%(opt,value)
6163
with open("initdb.log","a") as f:
62-
exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],stdout=f,stderr=subprocess.STDOUT)
64+
exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],env=env,stdout=f,stderr=subprocess.STDOUT)
6365
if exitcode:
6466
sys.exit(exitcode)
6567

.ci/run_install_check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export PGPORT
1919
./.ci/make_test_base $PGDATA
2020
#run checks
2121
set +e
22-
make installcheck-world prefix=`pwd`/tmp_install
22+
make installcheck-world prefix=`pwd`/tmp_install NO_LOCALE=1
2323
code=$?
2424
pg_ctl stop -D $PGDATA
2525
exit $code

0 commit comments

Comments
 (0)