Author: Charles Zablit Date: 2025-06-13T08:16:09-07:00 New Revision: 6751b3a549ebef78a7e75b100d61742c20945592
URL: https://github.com/llvm/llvm-project/commit/6751b3a549ebef78a7e75b100d61742c20945592 DIFF: https://github.com/llvm/llvm-project/commit/6751b3a549ebef78a7e75b100d61742c20945592.diff LOG: Revert "[lit] cleanup unused imports" (#144054) Reverts llvm/llvm-project#143930 as it causes build failures: https://github.com/llvm/llvm-project/pull/143930#issuecomment-2969115461 Added: Modified: lld/test/Unit/lit.cfg.py lldb/test/API/lit.cfg.py lldb/test/Shell/lit.cfg.py lldb/test/lit.cfg.py llvm/utils/lit/lit/LitConfig.py llvm/utils/lit/lit/TestRunner.py llvm/utils/lit/lit/discovery.py llvm/utils/lit/lit/worker.py Removed: ################################################################################ diff --git a/lld/test/Unit/lit.cfg.py b/lld/test/Unit/lit.cfg.py index 47375db517e96..1cf890a05cb28 100644 --- a/lld/test/Unit/lit.cfg.py +++ b/lld/test/Unit/lit.cfg.py @@ -3,6 +3,7 @@ # Configuration file for the 'lit' test runner. import os +import subprocess import lit.formats diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py index 04b360e8d3307..646a446c86fdb 100644 --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -9,6 +9,8 @@ import subprocess import sys +import lit.formats + # name: The name of this test suite. config.name = "lldb-api" diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py index 6f0e017fb7cb9..ab6113767187a 100644 --- a/lldb/test/Shell/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -7,9 +7,12 @@ import shutil import site import subprocess +import sys -import lit.util +import lit.formats from lit.llvm import llvm_config +from lit.llvm.subst import FindTool +from lit.llvm.subst import ToolSubst site.addsitedir(os.path.dirname(__file__)) from helper import toolchain diff --git a/lldb/test/lit.cfg.py b/lldb/test/lit.cfg.py index 6a4255c2627d9..eefc32aabd16d 100644 --- a/lldb/test/lit.cfg.py +++ b/lldb/test/lit.cfg.py @@ -2,6 +2,9 @@ import os +import lit.formats +from lit.llvm import llvm_config + # This is the top level configuration. Most of these configuration options will # be overriden by individual lit configuration files in the test # subdirectories. Anything configured here will *not* be loaded when pointing diff --git a/llvm/utils/lit/lit/LitConfig.py b/llvm/utils/lit/lit/LitConfig.py index 5bb2d3c5c986c..cb4aef6f72a87 100644 --- a/llvm/utils/lit/lit/LitConfig.py +++ b/llvm/utils/lit/lit/LitConfig.py @@ -1,12 +1,14 @@ from __future__ import absolute_import - import inspect import os +import platform import sys +import lit.Test +import lit.formats +import lit.TestingConfig import lit.util - # LitConfig must be a new style class for properties to work class LitConfig(object): """LitConfig - Configuration data for a 'lit' test runner instance, shared diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py index 1d3bf8e4e8df1..73db67aedb739 100644 --- a/llvm/utils/lit/lit/TestRunner.py +++ b/llvm/utils/lit/lit/TestRunner.py @@ -1,4 +1,7 @@ from __future__ import absolute_import +import errno +import io +import itertools import getopt import os, signal, subprocess, sys import re @@ -9,8 +12,11 @@ import shutil import tempfile import threading +import typing from typing import Optional, Tuple +import io + try: from StringIO import StringIO except ImportError: diff --git a/llvm/utils/lit/lit/discovery.py b/llvm/utils/lit/lit/discovery.py index 2e93bacc12368..2e7f90c6bb0c9 100644 --- a/llvm/utils/lit/lit/discovery.py +++ b/llvm/utils/lit/lit/discovery.py @@ -6,8 +6,8 @@ import os import sys -from lit import Test, util from lit.TestingConfig import TestingConfig +from lit import LitConfig, Test, util def chooseConfigFileFromDir(dir, config_names): diff --git a/llvm/utils/lit/lit/worker.py b/llvm/utils/lit/lit/worker.py index dbc3ab53bc627..8e78bfd45d38b 100644 --- a/llvm/utils/lit/lit/worker.py +++ b/llvm/utils/lit/lit/worker.py @@ -12,6 +12,8 @@ import traceback import lit.Test +import lit.util + _lit_config = None _parallelism_semaphores = None _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
