Author: jingham
Date: Tue May 23 11:11:21 2017
New Revision: 303643
URL: http://llvm.org/viewvc/llvm-project?rev=303643&view=rev
Log:
We shouldn't put actual tests in directories that contain
other test directories.
Added:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile
- copied, changed from r303642,
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/TestNumThreads.py
- copied unchanged from r303642,
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/main.cpp
- copied unchanged from r303642,
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/main.cpp
Removed:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/main.cpp
Removed:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile?rev=303642&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
(removed)
@@ -1,5 +0,0 @@
-LEVEL = ../../make
-
-CXX_SOURCES := main.cpp
-ENABLE_THREADS := YES
-include $(LEVEL)/Makefile.rules
Removed:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py?rev=303642&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
(removed)
@@ -1,61 +0,0 @@
-"""
-Test number of threads.
-"""
-
-from __future__ import print_function
-
-
-import os
-import time
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class NumberOfThreadsTestCase(TestBase):
-
- mydir = TestBase.compute_mydir(__file__)
-
- def setUp(self):
- # 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.')
-
- def test(self):
- """Test number of threads."""
- self.build()
- exe = os.path.join(os.getcwd(), "a.out")
- 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)
-
- # The breakpoint list should show 3 locations.
- self.expect(
- "breakpoint list -f",
- "Breakpoint location shown correctly",
- substrs=[
- "1: file = 'main.cpp', line = %d, exact_match = 0, locations =
1" %
- self.line])
-
- # Run the program.
- self.runCmd("run", RUN_SUCCEEDED)
-
- # Stopped once.
- self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
- substrs=["stop reason = breakpoint 1."])
-
- # Get the target process
- target = self.dbg.GetSelectedTarget()
- process = target.GetProcess()
-
- # 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.')
Removed:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/main.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/main.cpp?rev=303642&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/main.cpp
(original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/main.cpp
(removed)
@@ -1,50 +0,0 @@
-#include <condition_variable>
-#include <mutex>
-#include <thread>
-
-std::mutex mutex;
-std::condition_variable cond;
-
-void *
-thread3(void *input)
-{
- std::unique_lock<std::mutex> lock(mutex);
- cond.notify_all(); // Set break point at this line.
- return NULL;
-}
-
-void *
-thread2(void *input)
-{
- std::unique_lock<std::mutex> lock(mutex);
- cond.notify_all();
- cond.wait(lock);
- return NULL;
-}
-
-void *
-thread1(void *input)
-{
- std::thread thread_2(thread2, nullptr);
- thread_2.join();
-
- return NULL;
-}
-
-int main()
-{
- std::unique_lock<std::mutex> lock(mutex);
-
- std::thread thread_1(thread1, nullptr);
- cond.wait(lock);
-
- std::thread thread_3(thread3, nullptr);
- cond.wait(lock);
-
- lock.unlock();
-
- thread_1.join();
- thread_3.join();
-
- return 0;
-}
Copied:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile
(from r303642,
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile)
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile?p2=lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile&p1=lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile&r1=303642&r2=303643&rev=303643&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile
Tue May 23 11:11:21 2017
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
ENABLE_THREADS := YES
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
