Refactor the Rsearch*() methods out of existence in favor of simpler utility methods that return lists of repository directories.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index 6b4bc600..fcd0fee1 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -799,10 +799,7 @@ class BaseTestCase(unittest.TestCase):
                           LIBLINKSUFFIX = 'bar')
 
         def RDirs(pathlist, fs=env.fs):
-            return fs.Rsearchall(pathlist,
-                                 clazz=SCons.Node.FS.Dir,
-                                 must_exist=0,
-                                 cwd=fs.Dir('xx'))
+            return fs.Rfindalldirs(pathlist, fs.Dir('xx'))
 
         env['RDirs'] = RDirs
         flags = env.subst_list('$_LIBFLAGS', 1)[0]