Reverting r237392 since it broke TestNumThreads on ubuntu builder.

llvm-svn: 237415

1 files changed, 4 insertions, 6 deletions

diff --git a/lldb/test/functionalities/thread/TestNumThreads.py b/lldb/test/functionalities/thread/TestNumThreads.py
index 824956be8d4..d2156399d61 100644
--- a/lldb/test/functionalities/thread/TestNumThreads.py
+++ b/lldb/test/functionalities/thread/TestNumThreads.py
@@ -29,7 +29,7 @@ class NumberOfThreadsTestCase(TestBase):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line number to break inside main().
-        self.line = line_number('main.cpp', '// Set break point at this line.')
+        self.line = line_number('main.c', '// Set break point at this line.')
 
     def number_of_threads_test(self):
         """Test number of threads."""
@@ -37,11 +37,11 @@ class NumberOfThreadsTestCase(TestBase):
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # This should create a breakpoint with 1 location.
-        lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=1)
+        lldbutil.run_break_set_by_file_and_line (self, "main.c", self.line, num_expected_locations=1)
 
         # The breakpoint list should show 3 locations.
         self.expect("breakpoint list -f", "Breakpoint location shown correctly",
-            substrs = ["1: file = 'main.cpp', line = %d, locations = 1" % self.line])
+            substrs = ["1: file = 'main.c', line = %d, locations = 1" % self.line])
 
         # Run the program.
         self.runCmd("run", RUN_SUCCEEDED)
@@ -57,9 +57,7 @@ class NumberOfThreadsTestCase(TestBase):
         # Get the number of threads
         num_threads = process.GetNumThreads()
 
-        # Using std::thread may involve extra threads, so we assert that there are
-        # at least 4 rather than exactly 4.
-        self.assertTrue(num_threads >= 4, 'Number of expected threads and actual threads do not match.')
+        self.assertTrue(num_threads == 4, 'Number of expected threads and actual threads do not match.')
 
 if __name__ == '__main__':
     import atexit