aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-20 19:58:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-20 19:58:20 +0000
commit90b4350603ed91f4edd963ca1ba3427b15f54e50 (patch)
tree3f9e3ecc38b40f198588c13edb9db78f97a64ffe
parent55dc95f473d02b4fc0ea0634e20719d5505a0fe6 (diff)
downloadpaludis-90b4350603ed91f4edd963ca1ba3427b15f54e50.tar.gz
paludis-90b4350603ed91f4edd963ca1ba3427b15f54e50.tar.xz
gtest more
-rw-r--r--paludis/util/condition_variable_TEST.cc28
-rw-r--r--paludis/util/files.m42
2 files changed, 10 insertions, 20 deletions
diff --git a/paludis/util/condition_variable_TEST.cc b/paludis/util/condition_variable_TEST.cc
index c6a061a..1cb2053 100644
--- a/paludis/util/condition_variable_TEST.cc
+++ b/paludis/util/condition_variable_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,27 +17,17 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "condition_variable.hh"
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
+#include <paludis/util/condition_variable.hh>
+
+#include <gtest/gtest.h>
using namespace paludis;
-using namespace test;
-namespace test_cases
+TEST(ConditionVariable, Signal)
{
- struct ConditionTest : TestCase
- {
- ConditionTest() : TestCase("condition") { }
-
- void run()
- {
- ConditionVariable c;
- c.signal();
- c.broadcast();
- TEST_CHECK(true);
- }
- } test_condition;
+ ConditionVariable c;
+ c.signal();
+ c.broadcast();
+ SUCCEED();
}
-
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index f3ad1f6..2411e28 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -18,7 +18,7 @@ add(`channel', `hh', `cc')
add(`checked_delete', `hh')
add(`clone', `hh', `impl')
add(`config_file', `hh', `cc', `fwd', `se', `test', `testscript')
-add(`condition_variable', `hh', `cc', `test')
+add(`condition_variable', `hh', `cc', `gtest')
add(`cookie', `hh', `cc')
add(`create_iterator', `hh', `fwd', `impl', `gtest')
add(`damerau_levenshtein', `hh', `cc', `gtest')