Revert "Use cmd arguments instead of env variables in builder"

This reverts commit 55b981cb0fcb4c2d3b62d8412b507afedd8801da.

Author: dzhidzhoev

lldb/packages/Python/lldbsuite/test/builders/builder.py

@@ -153,7 +153,8 @@ def getToolchainSpec(self, compiler):
         cc_dir = cc_path.parent
 
         def getLlvmUtil(util_name):
-            return os.path.join(configuration.llvm_tools_dir, util_name + exe_ext)
+            llvm_tools_dir = os.getenv("LLVM_TOOLS_DIR", cc_dir)
+            return os.path.join(llvm_tools_dir, util_name + exe_ext)
 
         def getToolchainUtil(util_name):
             return cc_dir / (cc_prefix + util_name + cc_ext)
@@ -176,7 +177,7 @@ def getToolchainUtil(util_name):
             utils.extend(["LLVM_AR=%s" % llvm_ar])
 
         if not lldbplatformutil.platformIsDarwin():
-            if configuration.use_llvm_tools:
+            if os.getenv("USE_LLVM_TOOLS"):
                 # Use the llvm project tool instead of the system defaults.
                 for var, name in util_names.items():
                     utils.append("%s=%s" % (var, getLlvmUtil("llvm-" + name)))

lldb/packages/Python/lldbsuite/test/configuration.py

@@ -118,11 +118,6 @@
 # same base name.
 all_tests = set()
 
-# Force use llvm tools in API tests
-use_llvm_tools = False
-# Path to LLVM tools to be used by tests.
-llvm_tools_dir = None
-
 # LLDB library directory.
 lldb_libs_dir = None
 lldb_obj_root = None

lldb/packages/Python/lldbsuite/test/dotest.py

@@ -279,11 +279,7 @@ def parseOptionsAndInitTestdirs():
         configuration.dsymutil = seven.get_command_output(
             "xcrun -find -toolchain default dsymutil"
         )
-
-    if args.use_llvm_tools:
-        configuration.use_llvm_tools = True
     if args.llvm_tools_dir:
-        configuration.llvm_tools_dir = args.llvm_tools_dir
         configuration.filecheck = shutil.which("FileCheck", path=args.llvm_tools_dir)
         configuration.yaml2obj = shutil.which("yaml2obj", path=args.llvm_tools_dir)
 

lldb/packages/Python/lldbsuite/test/dotest_args.py

@@ -108,20 +108,12 @@ def create_parser():
         dest="dsymutil",
         help=textwrap.dedent("Specify which dsymutil to use."),
     )
-    group.add_argument(
-        "--use-llvm-tools",
-        dest="use_llvm_tools",
-        action="store_true",
-        help=textwrap.dedent(
-            "Force use LLVM tools for testing (llvm-ar, llvm-objcopy, etc.)."
-        ),
-    )
     group.add_argument(
         "--llvm-tools-dir",
         metavar="dir",
         dest="llvm_tools_dir",
         help=textwrap.dedent(
-            "The location of llvm tools used for testing (llvm-ar, yaml2obj, FileCheck, etc.)."
+            "The location of llvm tools used for testing (yaml2obj, FileCheck, etc.)."
         ),
     )