Prep v234: Apply missing upstream fixes in src/test (6/6)

diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c
index c27624b43f0e5f6b00b23f014cffadb508c398a8..64f37a2cf01f0a4c25f180b13b57fa5ee0ba6e27 100644 (file)
--- a/src/test/test-path-util.c
+++ b/src/test/test-path-util.c
@@ -27,6 +27,7 @@
 #include "mount-util.h"
 #include "path-util.h"
 #include "rm-rf.h"
 #include "mount-util.h"
 #include "path-util.h"
 #include "rm-rf.h"

+#include "stat-util.h"

 #include "string-util.h"
 #include "strv.h"
 #include "util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"

diff --git a/src/test/test-user-util.c b/src/test/test-user-util.c
index e54f79ec075acf836539ca0cd840170c7992091a..d79c0781b774cd3bf6f867a9ca04e06ad0d73866 100644 (file)
--- a/src/test/test-user-util.c
+++ b/src/test/test-user-util.c
@@ -18,7 +18,6 @@
 ***/
 
 #include "alloc-util.h"
 ***/
 
 #include "alloc-util.h"

-#include "def.h"

 #include "macro.h"
 #include "string-util.h"
 #include "user-util.h"
 #include "macro.h"
 #include "string-util.h"
 #include "user-util.h"


@@ -151,7 +150,9 @@ int main(int argc, char*argv[]) {
         test_uid_to_name_one(0xFFFFFFFF, "4294967295");
 
         test_gid_to_name_one(0, "root");
         test_uid_to_name_one(0xFFFFFFFF, "4294967295");
 
         test_gid_to_name_one(0, "root");

+#if 0 /// UNNEEDED by elogind

         test_gid_to_name_one(TTY_GID, "tty");
         test_gid_to_name_one(TTY_GID, "tty");

+#endif // 0

         test_gid_to_name_one(0xFFFF, "65535");
         test_gid_to_name_one(0xFFFFFFFF, "4294967295");
 
         test_gid_to_name_one(0xFFFF, "65535");
         test_gid_to_name_one(0xFFFFFFFF, "4294967295");