Skip to content

Commit 3b54027

Browse files
committed
CI scripts: document run_install_check and make make_test_base report error corretly
1 parent a57b79b commit 3b54027

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

.ci/make_test_base

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ On success, starts database
99
"""
1010
import os,sys,subprocess,glob,re,os.path,time
1111

12-
datadir=sys.argv[1]
13-
14-
if not datadir:
15-
print >>sys.stderr,"Usage %s directory"%sys.argv[0]
12+
if len(sys.argv)!=2:
13+
print >>sys.stderr,"Usage %s data-directory" % sys.argv[0]
1614
sys.exit(1)
1715

16+
datadir=sys.argv[1]
17+
1818
if os.access(datadir,os.R_OK):
1919
import shutil
2020
shutil.rmtree(datadir)

.ci/run_install_check

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
# Makes temporary installation and runs installcheck-world on it
33
# Should be run as non-privileged user.
44
# 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
518
set -e
619
# Install
720
make install prefix=`pwd`/tmp_install
@@ -19,7 +32,7 @@ export PGPORT
1932
./.ci/make_test_base $PGDATA
2033
#run checks
2134
set +e
22-
if [ -z "$1" ]; then
35+
if [ -z "$1" -o "$1" = "world" ]; then
2336
make installcheck-world prefix=`pwd`/tmp_install NO_LOCALE=1
2437
else
2538
dir=$1

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy