Move IS_ROOT definition to framework

Signed-off-by: Mats Wichmann <mats@linux.com>

SCons/CacheDirTests.py

@@ -28,18 +28,12 @@
 import tempfile
 import stat
 
-from TestCmd import TestCmd, IS_WINDOWS
+from TestCmd import TestCmd, IS_WINDOWS, IS_ROOT
 
 import SCons.CacheDir
 
 built_it = None
 
-try:
-    IS_ROOT = os.geteuid() == 0
-except AttributeError:
-    IS_ROOT = False
-
-
 class Action:
     def __call__(self, targets, sources, env, **kw) -> int:
         global built_it

SCons/Node/FSTests.py

@@ -31,7 +31,7 @@
 import stat
 from typing import Optional
 
-from TestCmd import TestCmd, IS_WINDOWS
+from TestCmd import TestCmd, IS_WINDOWS, IS_ROOT
 
 import SCons.Errors
 import SCons.Node.FS
@@ -44,12 +44,6 @@
 
 scanner_count = 0
 
-try:
-    IS_ROOT = os.geteuid() == 0
-except AttributeError:
-    IS_ROOT = False
-
-
 class Scanner:
     def __init__(self, node=None) -> None:
         global scanner_count

SCons/Variables/PathVariableTests.py

@@ -28,13 +28,7 @@
 import SCons.Variables
 
 import TestCmd
-from TestCmd import IS_WINDOWS
-
-try:
-    IS_ROOT = os.geteuid() == 0
-except AttributeError:
-    IS_ROOT = False
-
+from TestCmd import IS_WINDOWS, IS_ROOT
 
 class PathVariableTestCase(unittest.TestCase):
     def test_PathVariable(self) -> None:

test/Install/Install.py

@@ -31,6 +31,7 @@
 import time
 
 import TestSCons
+from TestCmd import IS_ROOT
 
 test = TestSCons.TestSCons()
 
@@ -132,10 +133,6 @@ def my_install(dest, source, env):
 test.write(['work', 'f1.in'], "f1.in again again\n")
 
 # This test is not designed to work if running as root
-try:
-    IS_ROOT = os.geteuid() == 0
-except AttributeError:
-    IS_ROOT = False
 if not IS_ROOT:
     os.chmod(test.workpath('work', 'export'), 0o555)
     with open(f1_out, 'rb'):

test/VariantDir/errors.py

@@ -33,13 +33,10 @@
 import stat
 import sys
 import TestSCons
+from TestCmd import IS_ROOT
 
 test = TestSCons.TestSCons()
 
-try:
-    IS_ROOT = os.geteuid() == 0
-except AttributeError:
-    IS_ROOT = False
 if IS_ROOT:
     test.skip_test('SConscript permissions meaningless when running as root; skipping test.\n')
 

testing/framework/TestCmd.py

@@ -329,6 +329,10 @@
 IS_MACOS = sys.platform == 'darwin'
 IS_64_BIT = sys.maxsize > 2**32
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
+try:
+    IS_ROOT = os.geteuid() == 0
+except AttributeError:
+    IS_ROOT = False
 NEED_HELPER = os.environ.get('SCONS_NO_DIRECT_SCRIPT')
 
 # sentinel for cases where None won't do