Changeset: a57c694e94fd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a57c694e94fd
Modified Files:
clients/mapiclient/curl-stream.h
clients/mapiclient/mclient.c
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Mar2025 branch.
diffs (124 lines):
diff --git a/clients/mapiclient/curl-stream.h b/clients/mapiclient/curl-stream.h
--- a/clients/mapiclient/curl-stream.h
+++ b/clients/mapiclient/curl-stream.h
@@ -53,9 +53,9 @@ open_urlstream(const char *url, char *er
if ((ret = curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, errbuf)) !=
CURLE_OK ||
(ret = curl_easy_setopt(handle, CURLOPT_URL, url)) != CURLE_OK ||
(ret = curl_easy_setopt(handle, CURLOPT_WRITEDATA, s)) != CURLE_OK
||
- (ret = curl_easy_setopt(handle, CURLOPT_VERBOSE, (long)0)) !=
CURLE_OK ||
- (ret = curl_easy_setopt(handle, CURLOPT_NOSIGNAL, (long)1)) !=
CURLE_OK ||
- (ret = curl_easy_setopt(handle, CURLOPT_FAILONERROR, (long)1)) !=
CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_VERBOSE, 0L)) != CURLE_OK ||
+ (ret = curl_easy_setopt(handle, CURLOPT_NOSIGNAL, 1L)) != CURLE_OK
||
+ (ret = curl_easy_setopt(handle, CURLOPT_FAILONERROR, 1L)) !=
CURLE_OK ||
(ret = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION,
write_callback)) != CURLE_OK ||
(ret = curl_easy_perform(handle)) != CURLE_OK) {
curl_easy_cleanup(handle);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1103,7 +1103,7 @@ def PerformDir(env, testdir, testlist, t
testlist = alltests
if not testlist:
Warn("No tests found in '%s`; skipping directory!" % TSTSRCDIR)
- return elem, max(FdOut, FdErr), interrupted
+ return TSTDIR, elem, max(FdOut, FdErr), interrupted
# find length of longest test name
length = max([len(tst[0]) for tst in testlist])
@@ -1135,14 +1135,14 @@ def PerformDir(env, testdir, testlist, t
raise
except:
Warn("database '%s` exists, but destroying it failed;
skipping tests in '%s`!" % (TSTDB, TSTSRCDIR))
- return elem, max(FdOut, FdErr), interrupted
+ return TSTDIR, elem, max(FdOut, FdErr), interrupted
keyfile = os.path.join(LogDBdir, '.vaultkey')
if os.path.isabs(LogDBdir):
try:
os.makedirs(LogDBdir, exist_ok=True)
except:
Warn("creating database '%s` failed; skipping tests in
'%s`!" % (TSTDB, TSTSRCDIR))
- return elem, max(FdOut, FdErr), interrupted
+ return TSTDIR, elem, max(FdOut, FdErr), interrupted
else:
if not initdb:
vaultkey = secrets.token_urlsafe(32).encode('ascii')
@@ -1155,14 +1155,14 @@ def PerformDir(env, testdir, testlist, t
z = zipfile.ZipFile(initdb)
except IOError:
Warn("initial database '%s` cannot be opened; skipping
tests in '%s`!" % (initdb, TSTSRCDIR))
- return elem, max(FdOut, FdErr), interrupted
+ return TSTDIR, elem, max(FdOut, FdErr), interrupted
try:
z.extractall(LogDBdir)
except KeyboardInterrupt:
raise
except:
Warn("initial database '%s` cannot be extracted; skipping
tests in '%s`!" % (initdb, TSTSRCDIR))
- return elem, max(FdOut, FdErr), interrupted
+ return TSTDIR, elem, max(FdOut, FdErr), interrupted
z.close()
if os.path.exists(keyfile):
vaultopt = ['--set', f'monet_vault_key={keyfile}']
@@ -1409,7 +1409,7 @@ def PerformDir(env, testdir, testlist, t
except:
pass
- return elem, max(FdOut, FdErr, ssout, sserr), interrupted
+ return TSTDIR, elem, max(FdOut, FdErr, ssout, sserr), interrupted
finally:
# del sys.path[0]
pass
@@ -4336,12 +4336,12 @@ def main(argv):
tsts = 'all tests'
if verbosity > 1:
print('\nRunning %s in directory %s.\n' % (tsts ,
testdirs[0]))
- elem, diff, interrupted = PerformDir(env, testdirs[0],
testlist, test_count)
+ tdir, elem, diff, interrupted = PerformDir(env, testdirs[0],
testlist, test_count)
if elem is not None:
if diff <= F_OK:
- body_good.append(elem)
+ body_good.append((tdir, elem))
else:
- body_bad.append(elem)
+ body_bad.append((tdir, elem))
if not errseen and diff > F_WARN:
errseen = True
else:
@@ -4368,14 +4368,14 @@ def main(argv):
if tp is not None:
future = d
d = futures[future]
- elem, diff, interrupted = future.result()
+ tdir, elem, diff, interrupted = future.result()
else:
- elem, diff, interrupted = PerformDir(env, d, [],
test_count)
+ tdir, elem, diff, interrupted = PerformDir(env, d,
[], test_count)
if elem is not None:
if diff <= F_OK:
- body_good.append(elem)
+ body_good.append((tdir, elem))
else:
- body_bad.append(elem)
+ body_bad.append((tdir, elem))
if not errseen and diff > F_WARN:
errseen = True
if interrupted:
@@ -4388,7 +4388,7 @@ def main(argv):
# after a directory has been tested, create
# the index file so that we can look at test
# results while the tests are running
- body = body_bad + body_good
+ body = [elem for (tdir, elem) in
sorted(body_bad)] + [elem for (tdir, elem) in sorted(body_good)]
CreateHtmlIndex(env, '',
os.path.join(TSTTRGBASE, TSTPREF), F_SKIP, F_SKIP, *body)
except KeyboardInterrupt:
if tp is not None:
@@ -4405,7 +4405,7 @@ def main(argv):
# if we get interrupted between directories, we still want output
pass
t_ = time.time() - t0
- body = body_bad + body_good
+ body = [elem for (tdir, elem) in sorted(body_bad)] + [elem for (tdir,
elem) in sorted(body_good)]
if not os.path.exists(os.path.join(TSTTRGBASE, TSTPREF)):
os.mkdir(os.path.join(TSTTRGBASE, TSTPREF))
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
