Changeset: 1c108518e69e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1c108518e69e
Modified Files:
cmake/monetdb-defines.cmake
debian/rules
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (189 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,7 +97,7 @@ if(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL
# SET(CMAKE_SKIP_RPATH TRUE)
endif()
-# required for some instalation files
+# required for some installation files
set(PROGRAM_PERMISSIONS_DEFAULT
OWNER_WRITE
OWNER_READ
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -300,16 +300,18 @@ macro(monetdb_configure_misc)
"PASSWORD_BACKEND invalid, choose one of MD5, SHA1, RIPEMD160, SHA224,
SHA256, SHA384, SHA512")
endif()
- # Used for installing testing python module (don't pass a location, else we
need to strip this again)
- execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import sysconfig;
print(sysconfig.get_path('purelib', vars={'base': ''})[1:])"
- RESULT_VARIABLE PY3_LIBDIR_CODE
- OUTPUT_VARIABLE PYTHON3_SITEDIR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if (PY3_LIBDIR_CODE)
- message(WARNING
- "Could not determine MonetDB Python3 site-packages instalation
directory")
+ if(NOT DEFINED PYTHON3_LIBDIR)
+ # Used for installing testing python module (don't pass a location, else
we need to strip this again)
+ execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import sysconfig;
print(sysconfig.get_path('purelib', vars={'base': ''})[1:])"
+ RESULT_VARIABLE PY3_LIBDIR_CODE
+ OUTPUT_VARIABLE PYTHON3_SITEDIR
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ if (PY3_LIBDIR_CODE)
+ message(WARNING
+ "Could not determine MonetDB Python3 site-packages installation
directory")
+ endif()
+ set(PYTHON3_LIBDIR "${PYTHON3_SITEDIR}")
endif()
- set(PYTHON3_LIBDIR "${PYTHON3_SITEDIR}")
set(PYTHON "${Python3_EXECUTABLE}")
if(MSVC)
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
+ -DPYTHON3_LIBDIR=lib/python3/dist-packages
-DCMAKE_INSTALL_RUNSTATEDIR=/run \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
diff --git a/sql/test/BugTracker-2022/Tests/delete-update.Bug-7267.test
b/sql/test/BugTracker-2022/Tests/delete-update.Bug-7267.test
--- a/sql/test/BugTracker-2022/Tests/delete-update.Bug-7267.test
+++ b/sql/test/BugTracker-2022/Tests/delete-update.Bug-7267.test
@@ -17,3 +17,5 @@ select count(*) from tmp where s <> 'hel
----
0
+statement ok
+drop table tmp
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1196,7 +1196,7 @@ def find_test_dirs(thisdir, recursive=Tr
return testdirs, tstcnt
### find_test_dirs(thisdir) #
-def PerformDir(env, testdir, testlist, all_tests, total_tests, test_progress) :
+def PerformDir(env, testdir, testlist, total_tests, test_progress) :
interrupted = False
td = 0
elem = None
@@ -1250,7 +1250,6 @@ def PerformDir(env, testdir, testlist, a
if testlist:
tl = []
- missing = False
for tst in testlist:
for t, c in alltests:
if t == tst:
@@ -1258,10 +1257,7 @@ def PerformDir(env, testdir, testlist, a
break
else:
tl.append((tst,None))
- missing = True
testlist = tl
- if not missing:
- all_tests = True
else:
testlist = alltests
if not testlist:
@@ -1394,7 +1390,7 @@ def PerformDir(env, testdir, testlist, a
tt, FtOut, FtErr, bodyline, reason =
0,F_SKIP,F_SKIP,None,"as the global timeout has been reached"
else:
os.environ['TST'] = TST
- tt, FtOut, FtErr, bodyline, reason, links = RunTest(env,
TST, COND, oktests, length, all_tests, pSrvr, total_tests, test_progress)
+ tt, FtOut, FtErr, bodyline, reason, links = RunTest(env,
TST, COND, oktests, length, pSrvr, total_tests, test_progress)
alllinks.extend(links)
if tt:
t = "%7.3f" % tt
@@ -1486,7 +1482,7 @@ def PerformDir(env, testdir, testlist, a
return td, elem, max(FdOut, FdErr, ssout, sserr), interrupted,
test_progress
finally:
del sys.path[0]
-### PerformDir(env, testdir, testlist, all_tests, total_tests, test_progress) #
+### PerformDir(env, testdir, testlist, total_tests, test_progress) #
# this function is a slightly modified copy of the posixpath version
# the differences are the doubling of \'s in the replacement value
@@ -1837,7 +1833,7 @@ relcond = {
'last hugeint chained empty'),
}
-def RunTest(env, TST, COND, oktests, length, all_tests, pSrvr, total_tests,
test_progress) :
+def RunTest(env, TST, COND, oktests, length, pSrvr, total_tests,
test_progress) :
global setpgrp
Failed = F_SKIP
FailedOut = F_SKIP
@@ -2133,7 +2129,7 @@ def RunTest(env, TST, COND, oktests, len
TestErr.close()
t0 = time.time()
- tres = DoIt(env, SERVER, CALL, TST, EXT, TestOutFile, TestErrFile,
TIMEOUT, ME, length, nomito, threads, user, passwd, COND, all_tests, pSrvr,
total_tests, test_progress)
+ tres = DoIt(env, SERVER, CALL, TST, EXT, TestOutFile, TestErrFile,
TIMEOUT, ME, length, nomito, threads, user, passwd, COND, pSrvr, total_tests,
test_progress)
t1 = time.time()
TX = t1 - t0
if verbosity > 0:
@@ -2679,7 +2675,7 @@ def progress(count, total, test):
s = '[{}/{}] ({}%) {}'.format(count, total, perc, test)
print('\r', s, end='', sep='', flush=True)
-def DoIt(env, SERVER, CALL, TST, EXT, TestOutFile, TestErrFile, TIMEOUT, ME,
length, nomito, threads, user, passwd, COND, all_tests, PSRVR, total_tests,
test_progress) :
+def DoIt(env, SERVER, CALL, TST, EXT, TestOutFile, TestErrFile, TIMEOUT, ME,
length, nomito, threads, user, passwd, COND, PSRVR, total_tests, test_progress)
:
ATJOB2 = ""
print(file=sys.stderr, end='', flush=True)
if verbosity == 0:
@@ -3388,7 +3384,6 @@ def main(argv) :
approve = opts.approve
produce_html = opts.produce_html
addreqs = False
- all_tests = False
testweb = opts.testweb
if testweb and verbosity == 0:
verbosity = 1
@@ -3853,12 +3848,14 @@ def main(argv) :
if t not in testdirs:
testdirs.append(t)
else:
+ test_count = 0
for d in dirlist:
- test_dirs, test_count = find_test_dirs(d, recursive=False)
- if test_count == 0:
+ test_dirs, cnt = find_test_dirs(d, recursive=False)
+ if cnt == 0:
Warn("No tests found in '%s`; skipping directory!" % d)
else:
testdirs.extend(test_dirs)
+ test_count += cnt
if len(testdirs) > 1 and testlist:
testlist = []
@@ -3960,13 +3957,12 @@ def main(argv) :
try:
if len(testdirs) == 1:
if testlist:
- tsts = "tests "+str(testlist)
+ tsts = "tests " + ", ".join(testlist)
else:
tsts = "all tests"
- all_tests = True
if verbosity > 1:
print("\nRunning %s in directory %s.\n" % (tsts ,
testdirs[0]))
- t_, elem, diff, interrupted, test_progress = PerformDir(env,
testdirs[0], testlist, all_tests, test_count, test_progress)
+ t_, elem, diff, interrupted, test_progress = PerformDir(env,
testdirs[0], testlist, test_count, test_progress)
if elem is not None:
if diff <= F_OK:
body_good.append(elem)
@@ -3976,7 +3972,7 @@ def main(argv) :
if verbosity > 1:
print("\nRunning all tests in directories %s.\n" %
str(testdirs))
for d in testdirs:
- t, elem, diff, interrupted, test_progress =
PerformDir(env, d, [], True, test_count, test_progress)
+ t, elem, diff, interrupted, test_progress =
PerformDir(env, d, [], test_count, test_progress)
t_ = t_ + t
if elem is not None:
if diff <= F_OK:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
