Skip to content

Revert "[lit] cleanup unused imports" #144054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lld/test/Unit/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Configuration file for the 'lit' test runner.

import os
import subprocess

import lit.formats

Expand Down
2 changes: 2 additions & 0 deletions lldb/test/API/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import subprocess
import sys

import lit.formats

# name: The name of this test suite.
config.name = "lldb-api"

Expand Down
5 changes: 4 additions & 1 deletion lldb/test/Shell/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions lldb/test/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions llvm/utils/lit/lit/LitConfig.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions llvm/utils/lit/lit/TestRunner.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
from __future__ import absolute_import
import errno
import io
import itertools
import getopt
import os, signal, subprocess, sys
import re
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion llvm/utils/lit/lit/discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 2 additions & 0 deletions llvm/utils/lit/lit/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import traceback

import lit.Test
import lit.util


_lit_config = None
_parallelism_semaphores = None
Expand Down
Loading