[lit, test-suite] Fix a reference to FileBasedTest that I missed earlier.

[dlj]

Summary

The test-suite implements its own specialized lit format for running tests,
which was based on FileBasedTest. Since that base was removed, the format now
needs to use something that is still available.

The only functionality that comes from FileBasedTest is the test discovery,
which was moved into ShTest. For now, it seems to make the most sense simply to
use ShTest as the base for TestSuiteTest.

I think a better solution is to factor out the test discovery logic, although
that will require a bit more work (and has effects across projects).

[MatzeB]

What happens when the user is using the lit from "pip install lit" instead of the one coming with llvm? Alternative question: Who is able to update the pypy package?

[dlj]

In D34830#795765, @MatzeB wrote:

What happens when the user is using the lit from "pip install lit" instead of the one coming with llvm?

That should be fine. ShTest has the same semantics before and after, so importing the old or the new version of ShTest will work.

Now, if they were using an old version of test-suite and the new version of lit, the answer would be different.

[MatzeB]

In D34830#795804, @dlj wrote:

In D34830#795765, @MatzeB wrote:

What happens when the user is using the lit from "pip install lit" instead of the one coming with llvm?

That should be fine. ShTest has the same semantics before and after, so importing the old or the new version of ShTest will work.

Now, if they were using an old version of test-suite and the new version of lit, the answer would be different.

Ok, that's fine. Thanks for the fix.

[leandron]

@dlj Thanks for the fix. It runs fine with ToT lit and ToT test-suite.

test-suite/trunk/litsupport/test.py

 """
 Main integration for llvm-lit: This defines a lit test format.
 Also contains logic to load benchmark modules.
 """
 import importlib
 import lit
 import lit.util
 import logging
 import os
-from lit.formats import FileBasedTest
+from lit.formats import ShTest
 from lit.TestRunner import getTempPaths
 from lit import Test
 from lit.util import to_bytes, to_string
 
 from litsupport import codesize
 from litsupport import compiletime
 from litsupport import hash
 from litsupport import perf
for name in test_modules:
         if not hasattr(module, 'mutatePlan'):
             logging.error("Invalid test module '%s': No mutatePlan() function."
                           % modulename)
             sys.exit(1)
         logging.info("Loaded test module %s" % module.__file__)
         modules.append(module)
 
 
-class TestSuiteTest(FileBasedTest):
+class TestSuiteTest(ShTest):
     def __init__(self):
         super(TestSuiteTest, self).__init__()
 
     def execute(self, test, litConfig):
         config = test.config
         if config.unsupported:
             return lit.Test.Result(Test.UNSUPPORTED, 'Test is unsupported')
         if litConfig.noExecute: