← Back to branch summary

~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150

« back to all changes in this revision

Viewing changes to utils/lit/lit/TestFormats.py

  • Committer: Package Import Robot
  • Author(s): Sylvestre Ledru
  • Date: 2013-05-27 15:01:57 UTC
  • mfrom: (0.10.1) (0.9.1) (0.8.1) (0.7.1) (0.6.1) (0.5.2)
  • Revision ID: package-import@ubuntu.com-20130527150157-tdkrsjpuvht7v0qx
Tags: 1:3.4~svn182733-1~exp1
http://bugs.debian.org/708677
* New snapshot release (3.4 release)
* Add a symlink of libLLVM-3.4.so.1 to usr/lib/llvm-3.4/lib/libLLVM-3.4.so
    to fix make the llvm-config-3.4 --libdir work (Closes: #708677)
  * Various packages rename to allow co installations:
    * libclang1 => libclang1-3.4
    * libclang1-dbg => libclang1-3.4-dbg
    * libclang-dev => libclang-3.4-dev
    * libclang-common-dev => libclang-common-3.4-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
utils/lit/lit/TestFormats.py
61
61
        (dirname, basename) = os.path.split(execpath)
62
62
        # Discover the tests in this executable.
63
63
        for testname in self.getGTestTests(execpath, litConfig, localConfig):
64
 
            testPath = path_in_suite + (dirname, basename, testname)
65
 
            yield Test.Test(testSuite, testPath, localConfig)
66
 
    
 
64
            testPath_in_suite = path_in_suite + (basename, testname)
 
65
            yield Test.Test(testSuite, testPath_in_suite, localConfig)
 
66
 
67
67
    def getTestsInDirectory(self, testSuite, path_in_suite,
68
68
                            litConfig, localConfig):
69
69
        source_path = testSuite.getSourcePath(path_in_suite)
73
73
                # Iterate over executables in a directory.
74
74
                if not os.path.normcase(filename) in self.test_sub_dir:
75
75
                    continue
 
76
                filepath_in_suite = path_in_suite + (filename, )
76
77
                for subfilename in os.listdir(filepath):
77
78
                    execpath = os.path.join(filepath, subfilename)
78
79
                    for test in self.getTestsInExecutable(
79
 
                            testSuite, path_in_suite, execpath,
 
80
                            testSuite, filepath_in_suite, execpath,
80
81
                            litConfig, localConfig):
81
82
                      yield test
82
83
            elif ('.' in self.test_sub_dir):
 
84
                filepath_in_suite = path_in_suite + (filename, )
83
85
                for test in self.getTestsInExecutable(
84
 
                        testSuite, path_in_suite, filepath,
 
86
                        testSuite, filepath_in_suite, filepath,
85
87
                        litConfig, localConfig):
86
88
                    yield test
87
89