Commit05b3007

committed

.ci scripts: start test base with C locale to make some tests, which include server message in their output, pass

1 parentadb5255 commit05b3007Copy full SHA for 05b3007

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,10 @@ if os.access(datadir,os.R_OK):`
`19`	`19`	`importshutil`
`20`	`20`	`shutil.rmtree(datadir)`
`21`	`21`	`os.mkdir(datadir)`
	`22`	`+env=os.environ.copy()`
	`23`	`+env["LANG"]="C"`
`22`	`24`	`withopen("initdb.log","w")asf:`
`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)`
`24`	`26`	`ifexitcode:`
`25`	`27`	`sys.exit(exitcode)`
`26`	`28`	`# Collect extra config option`
`@@ -59,7 +61,7 @@ if addopts:`
`59`	`61`	`foropt,valueinaddopts.items():`
`60`	`62`	`print>>f,"%s=%s"%(opt,value)`
`61`	`63`	`withopen("initdb.log","a")asf:`
`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)`
`63`	`65`	`ifexitcode:`
`64`	`66`	`sys.exit(exitcode)`
`65`	`67`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export PGPORT`
`19`	`19`	`./.ci/make_test_base$PGDATA`
`20`	`20`	`#run checks`
`21`	`21`	`set +e`
`22`		-make installcheck-world prefix=`pwd`/tmp_install
	`22`	+make installcheck-world prefix=`pwd`/tmp_install NO_LOCALE=1
`23`	`23`	`code=$?`
`24`	`24`	`pg_ctl stop -D$PGDATA`
`25`	`25`	`exit$code`

Comments

(0)