diff options
| author | Daniel Malea <daniel.malea@intel.com> | 2013-07-30 21:34:44 +0000 |
|---|---|---|
| committer | Daniel Malea <daniel.malea@intel.com> | 2013-07-30 21:34:44 +0000 |
| commit | 1475fc76a3b64fd81b710d3a719d6fcc9f6996e2 (patch) | |
| tree | 1ad2018f34e767e3414b745398002e1e251caab0 /test/lang | |
| parent | 1d6437dc04e38fc75a703f188928f95ad7c5d582 (diff) | |
| download | lldb-1475fc76a3b64fd81b710d3a719d6fcc9f6996e2.tar.gz | |
Assorted test suite fixes as a result of GCC 4.8 validation efforts
- disable some TestConcurrentEvents cases (which are affected by llvm.org/pr16714 -- watchpoints in multithreaded programs)
- relax number-of-bp-locations check in TestUniqueTypes/TestUnsignedTypes
- skip TestDataFormatterStdVector cases with GCC 4.8 (known failure due to llvm.org/pr15301)
- workaround for race condition in TestHelloWorld.py
- update TestSettings.py to work on distros (like Fedora) that have /bin/cat hardlinked to /usr/bin/cat
After these changes, the test suite should run cleanly against GCC 4.8 (with DWARF v4)!
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@187451 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lang')
| -rw-r--r-- | test/lang/cpp/unique-types/TestUniqueTypes.py | 5 | ||||
| -rw-r--r-- | test/lang/cpp/unsigned_types/TestUnsignedTypes.py | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/test/lang/cpp/unique-types/TestUniqueTypes.py b/test/lang/cpp/unique-types/TestUniqueTypes.py index 9dd6fdae1..3579f7a93 100644 --- a/test/lang/cpp/unique-types/TestUniqueTypes.py +++ b/test/lang/cpp/unique-types/TestUniqueTypes.py @@ -41,10 +41,7 @@ class UniqueTypesTestCase(TestBase): exe = os.path.join(os.getcwd(), "a.out") self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) - - # GCC 4.6.3 (but not 4.4, 4.6.5 or 4.7) encodes two locations for the 'return 0' statement in main.cpp - locs = 2 if "gcc" in compiler_basename and "4.6.3" in self.getCompilerVersion() else 1 - lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=locs, loc_exact=True) + lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1, loc_exact=True) self.runCmd("run", RUN_SUCCEEDED) diff --git a/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/test/lang/cpp/unsigned_types/TestUnsignedTypes.py index 8d39099dc..ddf768ec6 100644 --- a/test/lang/cpp/unsigned_types/TestUnsignedTypes.py +++ b/test/lang/cpp/unsigned_types/TestUnsignedTypes.py @@ -41,7 +41,7 @@ class UnsignedTypesTestCase(TestBase): # if GCC is the target compiler, we cannot rely on an exact line match. need_exact = "gcc" not in self.getCompiler() # Break on line 19 in main() aftre the variables are assigned values. - lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1, loc_exact=need_exact) + lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1, loc_exact=need_exact) self.runCmd("run", RUN_SUCCEEDED) |