Commit3b54027

committed

CI scripts: document run_install_check and make make_test_base report error corretly

1 parenta57b79b commit3b54027Copy full SHA for 3b54027

File tree

+18

-5

lines changed

+18

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ On success, starts database`
`9`	`9`	`"""`
`10`	`10`	`importos,sys,subprocess,glob,re,os.path,time`
`11`	`11`
`12`		`-datadir=sys.argv[1]`
`13`		`-`
`14`		`-ifnotdatadir:`
`15`		`-print>>sys.stderr,"Usage %s directory"%sys.argv[0]`
	`12`	`+iflen(sys.argv)!=2:`
	`13`	`+print>>sys.stderr,"Usage %s data-directory"%sys.argv[0]`
`16`	`14`	`sys.exit(1)`
`17`	`15`
	`16`	`+datadir=sys.argv[1]`
	`17`	`+`
`18`	`18`	`ifos.access(datadir,os.R_OK):`
`19`	`19`	`importshutil`
`20`	`20`	`shutil.rmtree(datadir)`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,19 @@`
`2`	`2`	`# Makes temporary installation and runs installcheck-world on it`
`3`	`3`	`# Should be run as non-privileged user.`
`4`	`4`	`# Exit on all errors`
	`5`	`+# If run without arguments, makes installcheck-world`
	`6`	`+# Otherwise first argument is interpreted as subdirectory`
	`7`	`+# to change before runnning make installchedk`
	`8`	`+# i.e`
	`9`	`+# run_install_check .`
	`10`	`+# test core only`
	`11`	`+# run_install_check contrib`
	`12`	`+# tests contrib only`
	`13`	`+# etc.`
	`14`	`+# All other arguments are passed to Makefile intact`
	`15`	`+# To make possible pass arguments to installcheck-world`
	`16`	`+# run_install_check world`
	`17`	`+# does the same as no args`
`5`	`18`	`set -e`
`6`	`19`	`# Install`
`7`	`20`	make install prefix=`pwd`/tmp_install
`@@ -19,7 +32,7 @@ export PGPORT`
`19`	`32`	`./.ci/make_test_base$PGDATA`
`20`	`33`	`#run checks`
`21`	`34`	`set +e`
`22`		`-if [-z"$1" ];then`
	`35`	`+if [-z"$1"-o"$1"="world"];then`
`23`	`36`	make installcheck-world prefix=`pwd`/tmp_install NO_LOCALE=1
`24`	`37`	`else`
`25`	`38`	`dir=$1`

Comments

(0)