Changeset: 960d07003bff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=960d07003bff
Added Files:
clients/Tests/SingleServer
clients/mapiclient/Tests/SingleServer
monetdb5/mal/Tests/SingleServer
monetdb5/modules/mal/Tests/SingleServer
sql/test/SQLite_regress/sqllogictest/Tests/SingleServer
sql/test/ssqq/Tests/SingleServer
Modified Files:
MonetDB.spec
buildtools/selinux/monetdb.fc
buildtools/selinux/monetdb.te
Branch: linear-hashing
Log Message:
Merge with linear-hashing branch.
diffs (51 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -905,7 +905,9 @@ do
/usr/sbin/semodule -s ${selinuxvariant} -i \
%{_datadir}/selinux/${selinuxvariant}/monetdb.pp &> /dev/null || :
done
-/sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb
%{_rundir}/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5
%{_unitdir}/monetdbd.service &> /dev/null || :
+# use /var/run/monetdb since that's what it says in the monetdb.fc file
+# it says that because /run/monetdb for some reason doesn't work
+/sbin/restorecon -R %{_localstatedir}/monetdb5 %{_localstatedir}/log/monetdb
/var/run/monetdb %{_bindir}/monetdbd %{_bindir}/mserver5
%{_unitdir}/monetdbd.service &> /dev/null || :
/usr/bin/systemctl try-restart monetdbd.service
%postun selinux
diff --git a/buildtools/selinux/monetdb.fc b/buildtools/selinux/monetdb.fc
--- a/buildtools/selinux/monetdb.fc
+++ b/buildtools/selinux/monetdb.fc
@@ -4,6 +4,6 @@
/var/log/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_log_t,s0)
/var/monetdb5/dbfarm(/.*)?
gen_context(system_u:object_r:mserver5_db_t,s0)
/var/monetdb5/dbfarm/\.merovingian_properties --
gen_context(system_u:object_r:monetdbd_etc_t,s0)
-/run/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_var_run_t,s0)
+/var/run/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_var_run_t,s0)
/var/monetdb5/dbfarm/\.merovingian_lock --
gen_context(system_u:object_r:monetdbd_lock_t,s0)
/var/monetdb5/dbfarm/.*/\.gdk_lock --
gen_context(system_u:object_r:mserver5_lock_t,s0)
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
--- a/buildtools/selinux/monetdb.te
+++ b/buildtools/selinux/monetdb.te
@@ -1,4 +1,4 @@
-policy_module(monetdb, 0.8)
+policy_module(monetdb, 0.9)
# The above line declares that this file is a SELinux policy file. Its
# name is monetdb, so the file should be saved as monetdb.te
diff --git a/clients/Tests/SingleServer b/clients/Tests/SingleServer
new file mode 100644
--- /dev/null
+++ b/clients/Tests/SingleServer
@@ -0,0 +1,2 @@
+--set embedded_py=2
+--set embedded_r=true
diff --git a/clients/mapiclient/Tests/SingleServer
b/clients/mapiclient/Tests/SingleServer
new file mode 100644
diff --git a/monetdb5/mal/Tests/SingleServer b/monetdb5/mal/Tests/SingleServer
new file mode 100644
diff --git a/monetdb5/modules/mal/Tests/SingleServer
b/monetdb5/modules/mal/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/SingleServer
b/sql/test/SQLite_regress/sqllogictest/Tests/SingleServer
new file mode 100644
diff --git a/sql/test/ssqq/Tests/SingleServer b/sql/test/ssqq/Tests/SingleServer
new file mode 100644
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
