Merge branch 'bug1862' of git://github.com/jollyroger/buildbot

* 'bug1862' of git://github.com/jollyroger/buildbot:
  Add Debian fix for running test from root/fakeroot (fix-test-root.patch)
  Add Debian fix for texinfo manual (fix-info-dir.patch)

Fixes #1862

master/docs/buildbot.texinfo

@@ -33,6 +33,13 @@ provided the copyright notice and this notice are preserved.
 
 @end copying
 
+@ifinfo
+@dircategory Software development
+@direntry
+* Buildbot: (buildbot).        A system to automate the compile/test cycle
+@end direntry
+@end ifinfo
+
 @titlepage
 @title BuildBot
 @subtitle @value{VERSION}

master/setup.py

@@ -86,10 +86,6 @@ def _run(self, test_loc):
         # Mimick the trial script by adding the path as the last arg
         sys.argv.append(test_loc)
 
-        # No superuser should execute tests
-        if hasattr(os, "getuid") and os.getuid() == 0:
-            raise SystemExit('Do not test as a superuser! Exiting ...')
-
         # Add the current dir to path and pull it all together
         sys.path.insert(0, os.path.curdir)
         sys.path[:] = map(os.path.abspath, sys.path)