diff --git a/rpm/ssu.spec b/rpm/ssu.spec index 218a35f..7e69aec 100644 --- a/rpm/ssu.spec +++ b/rpm/ssu.spec @@ -31,6 +31,7 @@ Requires: ssu-network-proxy %{_libdir}/zypp/plugins/urlresolver/* %{_bindir}/ssu %{_libdir}/libssu.so.* +%{_libdir}/ssu/libsandboxhook.so %dir %{_sysconfdir}/zypp/credentials.d # ssu itself does not use the package-update triggers, but provides # them for the vendor data packages to use diff --git a/tests/testutils/sandboxhook.cpp b/sandboxhook/sandboxhook.cpp similarity index 100% rename from tests/testutils/sandboxhook.cpp rename to sandboxhook/sandboxhook.cpp diff --git a/sandboxhook/sandboxhook.pri b/sandboxhook/sandboxhook.pri new file mode 100644 index 0000000..8c85b4c --- /dev/null +++ b/sandboxhook/sandboxhook.pri @@ -0,0 +1,2 @@ +SSU_SANDBOX_PATH = /usr/lib/ssu/libsandboxhook.so +DEFINES += SSU_SANDBOX_PATH="'\"$${SSU_SANDBOX_PATH}\"'" diff --git a/sandboxhook/sandboxhook.pro b/sandboxhook/sandboxhook.pro new file mode 100644 index 0000000..42ad432 --- /dev/null +++ b/sandboxhook/sandboxhook.pro @@ -0,0 +1,14 @@ +include(../ssu_common.pri) +include(sandboxhook_dependencies.pri) + +TEMPLATE = lib +TARGET = sandboxhook + +CONFIG += unversioned_libname + +SOURCES = sandboxhook.cpp + +DESTDIR = $$DESTDIR_LIB + +target.path = /usr/lib/ssu +INSTALLS += target diff --git a/sandboxhook/sandboxhook_dependencies.pri b/sandboxhook/sandboxhook_dependencies.pri new file mode 100644 index 0000000..48c7cf6 --- /dev/null +++ b/sandboxhook/sandboxhook_dependencies.pri @@ -0,0 +1 @@ +include(../libssu/libssu.pri) diff --git a/ssu.pro b/ssu.pro index d100964..e034f15 100644 --- a/ssu.pro +++ b/ssu.pro @@ -7,11 +7,12 @@ ssuconfhack { SUBDIRS += ssuconfperm } -SUBDIRS += tests tools +SUBDIRS += sandboxhook tests tools ssucli.depends = libssu ssuurlresolver.depends = libssu -tests.depends = libssu +sandboxhook.depends = libssu +tests.depends = libssu sandboxhook ssuks.depends = libssu ssud.depends = libssu ssuslipstream.depends = libssu diff --git a/tests/tests.pro b/tests/tests.pro index 64a2121..33e4a11 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -3,7 +3,6 @@ CONFIG += ordered coverage debug SUBDIRS = \ testutils \ formatoutput \ - testutils/sandboxhook.pro \ ut_coreconfig \ ut_deviceinfo \ ut_featuremodel \ diff --git a/tests/testutils/sandboxhook.pro b/tests/testutils/sandboxhook.pro deleted file mode 100644 index bcafced..0000000 --- a/tests/testutils/sandboxhook.pro +++ /dev/null @@ -1,5 +0,0 @@ -TARGET = sandboxhook -include(../testlibrary.pri) -include(sandboxhook_dependencies.pri) - -SOURCES = sandboxhook.cpp diff --git a/tests/testutils/sandboxhook_dependencies.pri b/tests/testutils/sandboxhook_dependencies.pri deleted file mode 100644 index 37c741f..0000000 --- a/tests/testutils/sandboxhook_dependencies.pri +++ /dev/null @@ -1 +0,0 @@ -include(../../libssu/libssu.pri) diff --git a/tests/ut_ssucli/ssuclitest.cpp b/tests/ut_ssucli/ssuclitest.cpp index e872867..3eb9270 100644 --- a/tests/ut_ssucli/ssuclitest.cpp +++ b/tests/ut_ssucli/ssuclitest.cpp @@ -30,7 +30,7 @@ void SsuCliTest::init() qDebug() << "Using in-tree sandbox"; setenv("LD_PRELOAD", getenv("SSU_SANDBOX_PATH"), 1); } else - setenv("LD_PRELOAD", qPrintable(QString("%1/libsandboxhook.so").arg(TESTS_PATH)), 1); + setenv("LD_PRELOAD", SSU_SANDBOX_PATH, 1); m_bus = new QProcess(this); m_bus->start("dbus-daemon", diff --git a/tests/ut_ssucli/ut_ssucli_dependencies.pri b/tests/ut_ssucli/ut_ssucli_dependencies.pri index 5e56454..ac74bef 100644 --- a/tests/ut_ssucli/ut_ssucli_dependencies.pri +++ b/tests/ut_ssucli/ut_ssucli_dependencies.pri @@ -1,2 +1,3 @@ include(../../libssu/libssu.pri) +include(../../sandboxhook/sandboxhook.pri) include(../testutils/testutils.pri) diff --git a/tests/ut_ssuurlresolver/ssuurlresolvertest.cpp b/tests/ut_ssuurlresolver/ssuurlresolvertest.cpp index e0e86fc..1fe3913 100644 --- a/tests/ut_ssuurlresolver/ssuurlresolvertest.cpp +++ b/tests/ut_ssuurlresolver/ssuurlresolvertest.cpp @@ -32,7 +32,7 @@ void SsuUrlResolverTest::initTestCase() qDebug() << "Using in-tree sandbox"; setenv("LD_PRELOAD", getenv("SSU_SANDBOX_PATH"), 1); } else - setenv("LD_PRELOAD", qPrintable(QString("%1/libsandboxhook.so").arg(TESTS_PATH)), 1); + setenv("LD_PRELOAD", SSU_SANDBOX_PATH, 1); } void SsuUrlResolverTest::cleanupTestCase() diff --git a/tests/ut_ssuurlresolver/ut_ssuurlresolver_dependencies.pri b/tests/ut_ssuurlresolver/ut_ssuurlresolver_dependencies.pri index 37c741f..0145169 100644 --- a/tests/ut_ssuurlresolver/ut_ssuurlresolver_dependencies.pri +++ b/tests/ut_ssuurlresolver/ut_ssuurlresolver_dependencies.pri @@ -1 +1,2 @@ include(../../libssu/libssu.pri) +include(../../sandboxhook/sandboxhook.pri)