[debhelper-devel] [debhelper] 01/01: t: Make tests work without fakeroot when R³ is enabled

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit c778141b8fc62459b9a47a7ed75b4f2ad1362af0
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Nov 25 12:16:21 2017 +0000

    t: Make tests work without fakeroot when R³ is enabled
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 t/Test/DH.pm                    | 2 +-
 t/dh_installdocs/debian/control | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/t/Test/DH.pm b/t/Test/DH.pm
index b9275cb..a5465c5 100644
--- a/t/Test/DH.pm
+++ b/t/Test/DH.pm
@@ -87,7 +87,7 @@ sub run_dh_tool {
 sub uid_0_test_is_ok {
     return $ROOT_OK if defined($ROOT_OK);
     my $ok = 0;
-    if ($< == 0) {
+    if (Debian::Debhelper::Dh_Lib::DH_ENABLE_RRR_SUPPORT or $< == 0) {
         $ok = 1;
     } else {
         system('fakeroot true 2>/dev/null');
diff --git a/t/dh_installdocs/debian/control b/t/dh_installdocs/debian/control
index 48d4de2..7e9a228 100644
--- a/t/dh_installdocs/debian/control
+++ b/t/dh_installdocs/debian/control
@@ -2,6 +2,7 @@ Source: foo
 Section: misc
 Priority: optional
 Maintainer: Test <testing at nowhere>
+Rules-Requires-Root: no
 Standards-Version: 3.9.8
 
 Package: foo

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git