diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/use_lldb_suite.py | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1397c664d758..5c34932b1f49 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -38,11 +38,15 @@ set(LLDB_TEST_COMMON_ARGS ${CMAKE_BINARY_DIR}/bin/lldb${CMAKE_EXECUTABLE_SUFFIX} -s ${CMAKE_BINARY_DIR}/lldb-test-traces + -S nm -u CXXFLAGS -u CFLAGS ) if ( CMAKE_SYSTEM_NAME MATCHES "Windows" ) + # All tests are currently flaky on Windows, so rerun them all once when they fail. + set(LLDB_TEST_COMMON_ARGS ${LLDB_TEST_COMMON_ARGS} --rerun-all-issues) + set(LLDB_TEST_DEBUG_TEST_CRASHES 0 CACHE BOOL "(Windows only) Enables debugging of tests in the test suite by showing the crash dialog when lldb crashes") diff --git a/test/use_lldb_suite.py b/test/use_lldb_suite.py index 63a098cea220..f3e358af143b 100644 --- a/test/use_lldb_suite.py +++ b/test/use_lldb_suite.py @@ -17,6 +17,9 @@ def find_lldb_root(): lldb_root = find_lldb_root() if lldb_root is not None: import imp - module = imp.find_module("use_lldb_suite_root", [lldb_root]) - if module is not None: - imp.load_module("use_lldb_suite_root", *module) + fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root]) + try: + imp.load_module("use_lldb_suite_root", fp, pathname, desc) + finally: + if fp: + fp.close() |