sys-kernel/ugrd: fix for running the tests

communicate via PROPERTIES and addwrite that we need to run as root
and need write access to /dev/kvm

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

6 files changed, 18 insertions, 54 deletions

diff --git a/sys-kernel/ugrd/ugrd-1.22.0.ebuild b/sys-kernel/ugrd/ugrd-1.22.0.ebuild
index a38b24dd7d62..89a9cc845740 100644
--- a/sys-kernel/ugrd/ugrd-1.22.0.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.22.0.ebuild
@@ -14,6 +14,8 @@ SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm64"
+RESTRICT="test"
+PROPERTIES="test_privileged"
 
 RDEPEND="
 	app-misc/pax-utils
@@ -57,15 +59,7 @@ pkg_postinst() {
 distutils_enable_tests unittest
 
 src_test() {
-	if [[ ! -w '/dev/kvm' ]]; then
-		ewarn "Skipping tests: Cannot write to /dev/kvm."
-		return 1
-	fi
-	if [[ ! -r "$(command -v mount)" ]]; then
-		ewarn "Cannot read the mount binary, tests may fail until"
-		ewarn "util-linux is re-emerged without the sfperms feature."
-	fi
-
+	addwrite /dev/kvm
 	distutils-r1_src_test
 }
 
diff --git a/sys-kernel/ugrd/ugrd-1.24.2.ebuild b/sys-kernel/ugrd/ugrd-1.24.2.ebuild
index b8d3f75a0f20..0b40f4084bd5 100644
--- a/sys-kernel/ugrd/ugrd-1.24.2.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.24.2.ebuild
@@ -14,6 +14,8 @@ SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+PROPERTIES="test_privileged"
 
 RDEPEND="
 	app-misc/pax-utils
@@ -58,15 +60,7 @@ pkg_postinst() {
 distutils_enable_tests unittest
 
 src_test() {
-	if [[ ! -w '/dev/kvm' ]]; then
-		ewarn "Skipping tests: Cannot write to /dev/kvm."
-		return 1
-	fi
-	if [[ ! -r "$(command -v mount)" ]]; then
-		ewarn "Cannot read the mount binary, tests may fail until"
-		ewarn "util-linux is re-emerged without the sfperms feature."
-	fi
-
+	addwrite /dev/kvm
 	distutils-r1_src_test
 }
 
diff --git a/sys-kernel/ugrd/ugrd-1.25.0.ebuild b/sys-kernel/ugrd/ugrd-1.25.0.ebuild
index e20626ffd48f..61f7ba42490c 100644
--- a/sys-kernel/ugrd/ugrd-1.25.0.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.25.0.ebuild
@@ -14,6 +14,8 @@ SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+PROPERTIES="test_privileged"
 
 RDEPEND="
 	app-misc/pax-utils
@@ -59,15 +61,7 @@ pkg_postinst() {
 distutils_enable_tests unittest
 
 src_test() {
-	if [[ ! -w '/dev/kvm' ]]; then
-		ewarn "Skipping tests: Cannot write to /dev/kvm."
-		return 1
-	fi
-	if [[ ! -r "$(command -v mount)" ]]; then
-		ewarn "Cannot read the mount binary, tests may fail until"
-		ewarn "util-linux is re-emerged without the sfperms feature."
-	fi
-
+	addwrite /dev/kvm
 	distutils-r1_src_test
 }
 
diff --git a/sys-kernel/ugrd/ugrd-1.26.0.ebuild b/sys-kernel/ugrd/ugrd-1.26.0.ebuild
index add9d2aec5b3..59dca3e27ae0 100644
--- a/sys-kernel/ugrd/ugrd-1.26.0.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.26.0.ebuild
@@ -14,6 +14,8 @@ SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+PROPERTIES="test_privileged"
 
 RDEPEND="
 	app-misc/pax-utils
@@ -59,15 +61,7 @@ pkg_postinst() {
 distutils_enable_tests unittest
 
 src_test() {
-	if [[ ! -w '/dev/kvm' ]]; then
-		ewarn "Skipping tests: Cannot write to /dev/kvm."
-		return 1
-	fi
-	if [[ ! -r "$(command -v mount)" ]]; then
-		ewarn "Cannot read the mount binary, tests may fail until"
-		ewarn "util-linux is re-emerged without the sfperms feature."
-	fi
-
+	addwrite /dev/kvm
 	distutils-r1_src_test
 }
 
diff --git a/sys-kernel/ugrd/ugrd-1.27.1.ebuild b/sys-kernel/ugrd/ugrd-1.27.1.ebuild
index 0f0c38d3e139..21ddb7fb455a 100644
--- a/sys-kernel/ugrd/ugrd-1.27.1.ebuild
+++ b/sys-kernel/ugrd/ugrd-1.27.1.ebuild
@@ -14,6 +14,8 @@ SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
+RESTRICT="test"
+PROPERTIES="test_privileged"
 
 RDEPEND="
 	app-misc/pax-utils
@@ -62,15 +64,7 @@ pkg_postinst() {
 distutils_enable_tests unittest
 
 src_test() {
-	if [[ ! -w '/dev/kvm' ]]; then
-		ewarn "Skipping tests: Cannot write to /dev/kvm."
-		return 1
-	fi
-	if [[ ! -r "$(command -v mount)" ]]; then
-		ewarn "Cannot read the mount binary, tests may fail until"
-		ewarn "util-linux is re-emerged without the sfperms feature."
-	fi
-
+	addwrite /dev/kvm
 	distutils-r1_src_test
 }
 
diff --git a/sys-kernel/ugrd/ugrd-9999.ebuild b/sys-kernel/ugrd/ugrd-9999.ebuild
index 5fe6f7c4da3b..7029a52abb6f 100644
--- a/sys-kernel/ugrd/ugrd-9999.ebuild
+++ b/sys-kernel/ugrd/ugrd-9999.ebuild
@@ -13,6 +13,8 @@ EGIT_REPO_URI="https://github.com/desultory/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
+RESTRICT="test"
+PROPERTIES="test_privileged"
 
 RDEPEND="
 	app-misc/pax-utils
@@ -61,15 +63,7 @@ pkg_postinst() {
 distutils_enable_tests unittest
 
 src_test() {
-	if [[ ! -w '/dev/kvm' ]]; then
-		ewarn "Skipping tests: Cannot write to /dev/kvm."
-		return 1
-	fi
-	if [[ ! -r "$(command -v mount)" ]]; then
-		ewarn "Cannot read the mount binary, tests may fail until"
-		ewarn "util-linux is re-emerged without the sfperms feature."
-	fi
-
+	addwrite /dev/kvm
 	distutils-r1_src_test
 }