Changeset: e801e59bc9d4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e801e59bc9d4
Modified Files:
testing/Mconvert.py.in
testing/Mtest.py.in
testing/Mz.py.in
Branch: Jul2021
Log Message:
Remove --jenkins option.
diffs (90 lines):
diff --git a/testing/Mconvert.py.in b/testing/Mconvert.py.in
--- a/testing/Mconvert.py.in
+++ b/testing/Mconvert.py.in
@@ -2408,7 +2408,6 @@ def main(argv) :
parser.add_argument('--multifarm', action='store_true', dest='multifarm',
help='use multiple dbfarms (developers only)')
parser.add_argument('--transient-inmemory', action='store_true',
dest='inmemory', help="don't write transient data to disk")
parser.add_argument('--nomito', action='store_true', dest='nomito',
help='Do not pass --forcemito to server')
- parser.add_argument('--jenkins', action='store_true', dest='jenkins',
help='special handling for Jenkins')
parser.add_argument('--addreqs', action='store_true', dest='addreqs',
help='automatically add required tests when testing individual tests')
parser.add_argument('--global_timeout', '-T', action='store',
dest='global_timeout', type=int, default=global_timeout, metavar='<sec>',
help='global timeout')
parser.add_argument('--data_path', '-D', action='store', dest='data_path',
metavar='<path>', help='Path to the root directory of the data files needed for
testing')
@@ -2433,7 +2432,6 @@ def main(argv) :
global procdebug
procdebug = opts.procdebug
nomito = False
- jenkins = False
addreqs = False
testweb = opts.testweb
CONDITIONALS['RELEASERUN'] = opts.releaserun
@@ -2469,7 +2467,6 @@ def main(argv) :
env['TRANS_INMEM'] = 'True'
if opts.multifarm and opts.inmemory:
ErrXit("Cannot have both --multifarm and --transient-inmemory")
- jenkins = opts.jenkins
addreqs = opts.addreqs
a = opts.global_timeout
if a:
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3507,7 +3507,6 @@ def main(argv) :
parser.add_argument('--multifarm', action='store_true', dest='multifarm',
help='use multiple dbfarms (developers only)')
parser.add_argument('--transient-inmemory', action='store_true',
dest='inmemory', help="don't write transient data to disk")
parser.add_argument('--nomito', action='store_true', dest='nomito',
help='Do not pass --forcemito to server')
- parser.add_argument('--jenkins', action='store_true', dest='jenkins',
help='special handling for Jenkins')
parser.add_argument('--addreqs', action='store_true', dest='addreqs',
help='automatically add required tests when testing individual tests')
parser.add_argument('--global_timeout', '-T', action='store',
dest='global_timeout', type=int, default=global_timeout, metavar='<sec>',
help='global timeout')
parser.add_argument('--data_path', '-D', action='store', dest='data_path',
metavar='<path>', help='Path to the root directory of the data files needed for
testing')
@@ -3535,7 +3534,6 @@ def main(argv) :
global approve
approve = opts.approve
nomito = False
- jenkins = False
addreqs = False
all_tests = False
testweb = opts.testweb
@@ -3582,7 +3580,6 @@ def main(argv) :
env['TRANS_INMEM'] = 'True'
if opts.multifarm and opts.inmemory:
ErrXit("Cannot have both --multifarm and --transient-inmemory")
- jenkins = opts.jenkins
addreqs = opts.addreqs
a = opts.global_timeout
if a:
@@ -4306,8 +4303,6 @@ VALUES (%s, '%s', '%s', '%s',
After that, re-run Mtest.
""" % os.path.join(TSTTRGBASE, TSTPREF, "index.html"))
- if jenkins:
- sys.exit(0)
sys.exit(1)
else:
if quiet:
diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -2385,7 +2385,6 @@ def main(argv) :
parser.add_argument('--multifarm', action='store_true', dest='multifarm',
help='use multiple dbfarms (developers only)')
parser.add_argument('--transient-inmemory', action='store_true',
dest='inmemory', help="don't write transient data to disk")
parser.add_argument('--nomito', action='store_true', dest='nomito',
help='Do not pass --forcemito to server')
- parser.add_argument('--jenkins', action='store_true', dest='jenkins',
help='special handling for Jenkins')
parser.add_argument('--addreqs', action='store_true', dest='addreqs',
help='automatically add required tests when testing individual tests')
parser.add_argument('--global_timeout', '-T', action='store',
dest='global_timeout', type=int, default=global_timeout, metavar='<sec>',
help='global timeout')
parser.add_argument('--data_path', '-D', action='store', dest='data_path',
metavar='<path>', help='Path to the root directory of the data files needed for
testing')
@@ -2411,7 +2410,6 @@ def main(argv) :
global approve
approve = opts.approve
nomito = False
- jenkins = False
addreqs = False
testweb = opts.testweb
CONDITIONALS['RELEASERUN'] = opts.releaserun
@@ -2451,7 +2449,6 @@ def main(argv) :
env['TRANS_INMEM'] = 'True'
if opts.multifarm and opts.inmemory:
ErrXit("Cannot have both --multifarm and --transient-inmemory")
- jenkins = opts.jenkins
addreqs = opts.addreqs
a = opts.global_timeout
if a:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
