Changeset: 5041322e96c4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5041322e96c4
Modified Files:
MonetDB.spec
Branch: mtest
Log Message:
Merge with default branch.
diffs (45 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -785,11 +785,6 @@ fi
%setup -q
%build
-%if (0%{?fedora} >= 33)
-# on Fedora 33 we get a crash of the compiler when using -flto, so disable it
-CFLAGS="${CFLAGS:-%optflags} -fno-lto"
-export CFLAGS
-%endif
%cmake3 \
-DRELEASE_VERSION=ON \
-DASSERT=OFF \
diff --git a/testing/process.py b/testing/process.py
--- a/testing/process.py
+++ b/testing/process.py
@@ -464,5 +464,26 @@ class server(Popen):
break
if os.path.exists(started):
# server is ready
+ try:
+ conn = open(os.path.join(dbpath, '.conn')).read()
+ except:
+ if verbose:
+ print('failed to open {}'.format(os.path.join(dbpath,
'.conn')))
+ pass
+ else:
+ # retrieve mapi port if available
+ for c in conn.splitlines():
+ c = c.rstrip('/')
+ c = c.rsplit(':', maxsplit=1)
+ if len(c) == 2:
+ try:
+ port = int(c[1])
+ except ValueError:
+ pass
+ else:
+ if verbose:
+ print('mapi port: {}'.format(c[1]))
+ self.dbport = c[1]
+ break
break
time.sleep(0.001)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
