gtest more

2 files changed, 9 insertions, 18 deletions

diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index 4924f1749..c89083200 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -53,7 +53,7 @@ add(`make_shared_copy',                  `hh', `fwd')
 add(`map',                               `hh', `fwd', `impl', `cc')
 add(`member_iterator',                   `hh', `fwd', `impl', `test')
 add(`md5',                               `hh', `cc', `test')
-add(`mutex',                             `hh', `cc', `fwd', `test')
+add(`mutex',                             `hh', `cc', `fwd', `gtest')
 add(`named_value',                       `hh', `cc', `fwd')
 add(`no_type',                           `hh')
 add(`operators',                         `hh')
diff --git a/paludis/util/mutex_TEST.cc b/paludis/util/mutex_TEST.cc
index afd1e3c89..1131ef317 100644
--- a/paludis/util/mutex_TEST.cc
+++ b/paludis/util/mutex_TEST.cc
@@ -1,7 +1,7 @@
 /* vim: set sw=4 sts=4 et foldmethod=syntax : */
 
 /*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2011 Ciaran McCreesh
  *
  * This file is part of the Paludis package manager. Paludis is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General
@@ -17,25 +17,16 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "mutex.hh"
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
+#include <paludis/util/mutex.hh>
+
+#include <gtest/gtest.h>
 
 using namespace paludis;
-using namespace test;
 
-namespace test_cases
+TEST(Mutex, Lock)
 {
-    struct LockTest : TestCase
-    {
-        LockTest() : TestCase("lock") { }
-
-        void run()
-        {
-            Mutex m;
-            Lock l(m);
-            TEST_CHECK(true);
-        }
-    } test_lock;
+    Mutex m;
+    Lock l(m);
+    SUCCEED();
 }