Changeset: 882052d7d832 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/882052d7d832
Modified Files:
monetdb5/extras/rapi/Tests/All
sql/backends/monet5/Tests/All
testing/Mtest.py.in
Branch: Dec2025
Log Message:
A little cleanup.
- Remove Perl and PHP support in testing (not used);
- Remove NOT_WIN32 condition from tests that require R (we don't support
R on Windows, but the R condition suffices);
- Only test for R binary during testing if the system was compiled with
R support.
diffs (151 lines):
diff --git a/monetdb5/extras/rapi/Tests/All b/monetdb5/extras/rapi/Tests/All
--- a/monetdb5/extras/rapi/Tests/All
+++ b/monetdb5/extras/rapi/Tests/All
@@ -1,9 +1,9 @@
-HAVE_LIBR&NOT_WIN32?rapi00
-HAVE_LIBR&NOT_WIN32?rapi01
-HAVE_LIBR&HAVE_HGE&NOT_WIN32?rapi02
-HAVE_LIBR&NOT_WIN32?rapi03
-HAVE_LIBR&NOT_WIN32?rapi04
-HAVE_LIBR&NOT_WIN32?rapi05
-HAVE_LIBR&NOT_WIN32?rapi07
-HAVE_LIBR&NOT_WIN32?rapi08
-HAVE_LIBR&NOT_WIN32?rapi10
+HAVE_LIBR?rapi00
+HAVE_LIBR?rapi01
+HAVE_LIBR&HAVE_HGE?rapi02
+HAVE_LIBR?rapi03
+HAVE_LIBR?rapi04
+HAVE_LIBR?rapi05
+HAVE_LIBR?rapi07
+HAVE_LIBR?rapi08
+HAVE_LIBR?rapi10
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -1,25 +1,24 @@
optimizers
-HAVE_LIBR&NOT_WIN32?rapi00
-HAVE_LIBR&NOT_WIN32?rapi01
-HAVE_LIBR&NOT_WIN32?rapi02
-HAVE_LIBR&NOT_WIN32?rapi03
-HAVE_LIBR&NOT_WIN32?rapi05
-HAVE_LIBR&NOT_WIN32?rapi06
-HAVE_LIBR&NOT_WIN32?rapi07
-#HAVE_LIBR&NOT_WIN32?rapi08
-HAVE_LIBR&NOT_WIN32?rapi09
-HAVE_LIBR&NOT_WIN32&!R_VERSION>=4.2.0?rapi09a
-HAVE_LIBR&NOT_WIN32?rapi10
-HAVE_LIBR&NOT_WIN32?rapi12
-HAVE_LIBR&NOT_WIN32?rapi13
-HAVE_LIBR&NOT_WIN32?rapi14
-HAVE_LIBR&NOT_WIN32?rapi15
-HAVE_LIBR&NOT_WIN32?rapi16
-HAVE_LIBR&NOT_WIN32?rapi17
-HAVE_LIBR&NOT_WIN32?rapi18
-HAVE_LIBR&NOT_WIN32?rapi19
-HAVE_LIBR&NOT_WIN32?rapi20
+HAVE_LIBR?rapi00
+HAVE_LIBR?rapi01
+HAVE_LIBR?rapi02
+HAVE_LIBR?rapi03
+HAVE_LIBR?rapi05
+HAVE_LIBR?rapi06
+HAVE_LIBR?rapi07
+HAVE_LIBR?rapi09
+HAVE_LIBR&!R_VERSION>=4.2.0?rapi09a
+HAVE_LIBR?rapi10
+HAVE_LIBR?rapi12
+HAVE_LIBR?rapi13
+HAVE_LIBR?rapi14
+HAVE_LIBR?rapi15
+HAVE_LIBR?rapi16
+HAVE_LIBR?rapi17
+HAVE_LIBR?rapi18
+HAVE_LIBR?rapi19
+HAVE_LIBR?rapi20
# should this work?
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -283,8 +283,6 @@ CONDITIONALS = {
'HAVE_JDBCTESTS' : False,
'HAVE_JDBCTESTS_JAR' : False,
'HAVE_MONETDBJDBC_JAR' : False,
- 'HAVE_PERL' : False,
- 'HAVE_PHP' : False,
'HAVE_RUBY' : False,
'HAVE_SQLITE3ODBC' : False,
'MERCURIAL' : False,
@@ -3715,16 +3713,17 @@ def main(argv):
opts = parser.parse_args()
args = opts.tests
- r_noecho = '--no-echo'
- if CheckExec('R'):
- with process.Popen(['R', '--version'],
- stdout=process.PIPE, stderr=process.PIPE,
- text=True) as proc:
- r_out, r_err = proc.communicate()
- res = re.search(r'R version (?P<major>\d+)\.', r_out)
- if res is not None and int(res.group('major')) < 4:
- r_noecho = '--slave'
- if CONDITIONALS['HAVE_LIBR']:
+ if CONDITIONALS['HAVE_LIBR']:
+ if CheckExec('R'):
+ with process.Popen(['R', '--version'],
+ stdout=process.PIPE, stderr=process.PIPE,
+ text=True) as proc:
+ r_out, r_err = proc.communicate()
+ res = re.search(r'R version (?P<major>\d+)\.', r_out)
+ if res is not None and int(res.group('major')) < 4:
+ r_noecho = '--slave'
+ else:
+ r_noecho = '--no-echo'
with process.Popen(['R', r_noecho, '--no-save', '--no-restore',
'-e', 'print(Sys.getenv("R_LIBS_USER"))'],
stdout=process.PIPE, stderr=process.PIPE,
@@ -3734,6 +3733,11 @@ def main(argv):
if res is not None:
rdir = os.path.expanduser(res.group('dir'))
os.makedirs(rdir, exist_ok=True)
+ r_noecho = r_out = r_err = None # clean junk
+ else:
+ # couldn't find R
+ print('Compiled with R support but cannot find R binary')
+ CONDITIONALS['HAVE_LIBR'] = False
CONDITIONALS['HAVE_SQLITE3ODBC'] =
os.path.exists('/usr/lib64/libsqlite3odbc.so')
@@ -3893,28 +3897,6 @@ def main(argv):
if env.get('TSTDATAPATH'):
CONDITIONALS['HAVE_DATA_PATH'] = True
- if CheckExec('perl'):
- with process.Popen(['perl', '-e', 'use MonetDB::CLI::MapiPP; use
DBI;'],
- stdout=process.PIPE, stderr=process.PIPE,
- text=True) as proc:
- perl_out, perl_err = proc.communicate()
- if proc.returncode == 0:
- CONDITIONALS['HAVE_PERL'] = True
- else:
- print('Perl available, but MonetDB driver or DBI module not
available')
- if CheckExec('php'):
- phpcmd = ['php']
- if 'PHP_INCPATH' in os.environ:
- phpcmd.extend(['-d', 'include_path=%s' %
os.environ['PHP_INCPATH']])
- phpcmd.extend(['-r', "require 'monetdb/php_monetdb.php';"])
- with process.Popen(phpcmd,
- stdout=process.PIPE, stderr=process.PIPE,
- text=True) as proc:
- php_out, php_err = proc.communicate()
- if proc.returncode == 0:
- CONDITIONALS['HAVE_PHP'] = True
- else:
- print('PHP available, but MonetDB driver not available')
if CheckExec('ruby'):
# also check ruby version; we require >= 1.9 for "require_relative"
with process.Popen(['ruby', '--version'],
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
