Added test_mutex to unittests.

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>

diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
index 239ba37dbcb0562aa5b8f34f2e9e2cdb9f27bd8c..693a2bee66af8ed1fd5cc2540bd1a8b0a2013085 100644 (file)
--- a/src/test/common/CMakeLists.txt
+++ b/src/test/common/CMakeLists.txt
@@ -202,6 +202,13 @@ add_executable(unittest_mutex_debug
 add_ceph_unittest(unittest_mutex_debug ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_mutex_debug)
 target_link_libraries(unittest_mutex_debug global ${BLKID_LIBRARIES} ${EXTRALIBS})
 
+# unittest_mutex
+add_executable(unittest_mutex
+  test_mutex.cc
+  )
+add_ceph_unittest(unittest_mutex ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_mutex)
+target_link_libraries(unittest_mutex global ${BLKID_LIBRARIES} ${EXTRALIBS})
+
 # unittest_shunique_lock
 add_executable(unittest_shunique_lock
   test_shunique_lock.cc

diff --git a/src/test/common/test_mutex.cc b/src/test/common/test_mutex.cc
index 38e2739cb8214684ce342135de21445b82766aab..eea86df204f255f5cc9c4e5a31180dd80bf5be44 100644 (file)
--- a/src/test/common/test_mutex.cc
+++ b/src/test/common/test_mutex.cc
@@ -31,13 +31,13 @@ void do_init() {
   }
 }
 
-TEST(MutexDebug, NormalAsserts) {
+TEST(Mutex, NormalAsserts) {
   Mutex* m = new Mutex("Normal",false);
   m->Lock();
   EXPECT_THROW(m->Lock(), int);
 }
 
-TEST(MutexDebug, RecursiveWithLockdep) {
+TEST(Mutex, RecursiveWithLockdep) {
   do_init();
   g_lockdep = 1;
   Mutex* m = new Mutex("Recursive1",true);
@@ -48,7 +48,7 @@ TEST(MutexDebug, RecursiveWithLockdep) {
   delete m;
 }
 
-TEST(MutexDebug, RecursiveWithoutLockdep) {
+TEST(Mutex, RecursiveWithoutLockdep) {
   do_init();
   g_lockdep = 0;
   Mutex* m = new Mutex("Recursive2",true);
@@ -59,7 +59,7 @@ TEST(MutexDebug, RecursiveWithoutLockdep) {
   delete m;
 }
 
-TEST(MutexDebug, DeleteLocked) {
+TEST(Mutex, DeleteLocked) {
   Mutex* m = new Mutex("Recursive3",false);
   m->Lock();
   EXPECT_DEATH(delete m,".*");