From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 25 Mar 2021 11:19:18 +0000 (+0100)
Subject: tests: drop calls to unsetenv SYSTEMD_MEMPOOL
X-Git-Tag: v248-2~10^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F19116%2Fhead;p=thirdparty%2Fsystemd.git

tests: drop calls to unsetenv SYSTEMD_MEMPOOL

Coverity was complaining that we don't check the return value, which we stopped
doing in 772e0a76f34914f6f81205e912e4744c6b23f704.

But it seems that we don't want those calls at all. The test was originally
added with the call in a6ee01caf3409ba9820e8824b9262fbac31a9f77, but I don't
see why we should override this. If the user wants to execute the test with
mempool disabled, we shouldn't ignore that.

Coverity CID#1444464, CID#1444466.
---

diff --git a/src/libsystemd/sd-device/test-sd-device-thread.c b/src/libsystemd/sd-device/test-sd-device-thread.c
index 763e98c114d..644f3c2aeee 100644
--- a/src/libsystemd/sd-device/test-sd-device-thread.c
+++ b/src/libsystemd/sd-device/test-sd-device-thread.c
@@ -30,8 +30,6 @@ int main(int argc, char *argv[]) {
         const char *key, *value;
         int r;
 
-        unsetenv("SYSTEMD_MEMPOOL");
-
         r = sd_device_new_from_syspath(&loopback, "/sys/class/net/lo");
         if (r < 0)
                 return handle_error_errno(r, "Failed to create loopback device object");
diff --git a/src/libudev/test-udev-device-thread.c b/src/libudev/test-udev-device-thread.c
index 3f0341a698a..c082fdca468 100644
--- a/src/libudev/test-udev-device-thread.c
+++ b/src/libudev/test-udev-device-thread.c
@@ -28,8 +28,6 @@ int main(int argc, char *argv[]) {
         pthread_t t;
         int r;
 
-        unsetenv("SYSTEMD_MEMPOOL");
-
         loopback = udev_device_new_from_syspath(NULL, "/sys/class/net/lo");
         if (!loopback)
                 return handle_error_errno(errno, "Failed to create loopback device object");