From 7b0cdf7bf44e626977d607279a933e45346aeac8 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 21 Aug 2013 22:26:26 +0000 Subject: [lit] Extract TestFormat base class, for future use. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188945 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/lit/lit/Test.py | 6 ------ utils/lit/lit/formats/__init__.py | 2 +- utils/lit/lit/formats/base.py | 9 +++++++-- utils/lit/lit/formats/googletest.py | 3 ++- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'utils/lit/lit') diff --git a/utils/lit/lit/Test.py b/utils/lit/lit/Test.py index cf12425902..dc2a435c2f 100644 --- a/utils/lit/lit/Test.py +++ b/utils/lit/lit/Test.py @@ -20,12 +20,6 @@ UNSUPPORTED = TestResult('UNSUPPORTED', False) # Test classes. -class TestFormat: - """TestFormat - Test information provider.""" - - def __init__(self, name): - self.name = name - class TestSuite: """TestSuite - Information on a group of tests. diff --git a/utils/lit/lit/formats/__init__.py b/utils/lit/lit/formats/__init__.py index f4a303c4c5..6862708417 100644 --- a/utils/lit/lit/formats/__init__.py +++ b/utils/lit/lit/formats/__init__.py @@ -1,4 +1,4 @@ from __future__ import absolute_import -from lit.formats.base import FileBasedTest, OneCommandPerFileTest +from lit.formats.base import TestFormat, FileBasedTest, OneCommandPerFileTest from lit.formats.googletest import GoogleTest from lit.formats.shtest import ShTest diff --git a/utils/lit/lit/formats/base.py b/utils/lit/lit/formats/base.py index b384ec2f0c..9e5420ba76 100644 --- a/utils/lit/lit/formats/base.py +++ b/utils/lit/lit/formats/base.py @@ -5,7 +5,12 @@ import sys import lit.Test import lit.util -class FileBasedTest(object): +class TestFormat(object): + pass + +### + +class FileBasedTest(TestFormat): def getTestsInDirectory(self, testSuite, path_in_suite, litConfig, localConfig): source_path = testSuite.getSourcePath(path_in_suite) @@ -27,7 +32,7 @@ class FileBasedTest(object): import re import tempfile -class OneCommandPerFileTest: +class OneCommandPerFileTest(TestFormat): # FIXME: Refactor into generic test for running some command on a directory # of inputs. diff --git a/utils/lit/lit/formats/googletest.py b/utils/lit/lit/formats/googletest.py index 8465a0b909..b77e184d2f 100644 --- a/utils/lit/lit/formats/googletest.py +++ b/utils/lit/lit/formats/googletest.py @@ -5,10 +5,11 @@ import sys import lit.Test import lit.TestRunner import lit.util +from .base import TestFormat kIsWindows = sys.platform in ['win32', 'cygwin'] -class GoogleTest(object): +class GoogleTest(TestFormat): def __init__(self, test_sub_dir, test_suffix): self.test_sub_dir = os.path.normcase(str(test_sub_dir)).split(';') self.test_suffix = str(test_suffix) -- cgit v1.2.3