From a0e485da8a2c831826558e11ff552dd7a8ba8291 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 8 Nov 2018 15:39:38 +0000
Subject: [PATCH] util-linux: fix TEST. (#3345)

---
 .../patches/util_linux-2.33.patchset          | 51 +++++++++++++++++++
 sys-apps/util-linux/util_linux-2.33.recipe    |  5 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/sys-apps/util-linux/patches/util_linux-2.33.patchset b/sys-apps/util-linux/patches/util_linux-2.33.patchset
index d273d12fc..5b3f1eb2a 100644
--- a/sys-apps/util-linux/patches/util_linux-2.33.patchset
+++ b/sys-apps/util-linux/patches/util_linux-2.33.patchset
@@ -197,3 +197,54 @@ index e0a3cc2..21580cd 100644
 -- 
 2.19.1
 
+
+From b93db0c4aad939824a0881b6995b3c1f1961cfac Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Thu, 8 Nov 2018 07:27:38 +0000
+Subject: Skip tests which fail to build.
+
+
+diff --git a/tests/helpers/Makemodule.am b/tests/helpers/Makemodule.am
+index ab0b3ce..393af5e 100644
+--- a/tests/helpers/Makemodule.am
++++ b/tests/helpers/Makemodule.am
+@@ -21,8 +21,8 @@ check_PROGRAMS += test_sigreceive
+ test_sigreceive_SOURCES = tests/helpers/test_sigreceive.c
+ test_sigreceive_LDADD = $(LDADD) libcommon.la
+ 
+-check_PROGRAMS += test_tiocsti
+-test_tiocsti_SOURCES = tests/helpers/test_tiocsti.c
++# check_PROGRAMS += test_tiocsti
++# test_tiocsti_SOURCES = tests/helpers/test_tiocsti.c
+ 
+ check_PROGRAMS += test_uuid_namespace
+ test_uuid_namespace_SOURCES = tests/helpers/test_uuid_namespace.c \
+-- 
+2.19.1
+
+
+From 646efc2df34d7acd9e4b15f8df6213517d5b236f Mon Sep 17 00:00:00 2001
+From: fbrosson <fbrosson@localhost>
+Date: Thu, 8 Nov 2018 07:29:11 +0000
+Subject: include posix/syslog.h instead of sys/syslog.h
+
+
+diff --git a/login-utils/logindefs.c b/login-utils/logindefs.c
+index ebf1a9f..b69cc67 100644
+--- a/login-utils/logindefs.c
++++ b/login-utils/logindefs.c
+@@ -26,7 +26,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __HAIKU__
+ #include <sys/syslog.h>
++#else
++#include <posix/syslog.h>
++#endif
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+-- 
+2.19.1
+
diff --git a/sys-apps/util-linux/util_linux-2.33.recipe b/sys-apps/util-linux/util_linux-2.33.recipe
index 3d0196c3c..a267a143a 100644
--- a/sys-apps/util-linux/util_linux-2.33.recipe
+++ b/sys-apps/util-linux/util_linux-2.33.recipe
@@ -226,5 +226,8 @@ INSTALL()
 
 TEST()
 {
-	make check
+	# Set TS_OPTS="" otherwise "--nonroot" is passed to tests/run.sh which
+	# then returns "Ignore util-linux test suite [non-root UID expected]."
+	LIBRARY_PATH="$sourceDir/.libs${LIBRARY_PATH:+:$LIBRARY_PATH}" \
+	make check TS_OPTS=
 }