← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to unittests/main.cc

  • Committer: Lee Bieber
  • Date: 2011-01-24 17:19:11 UTC
  • mfrom: (2097.2.8 trunk-unittests)
  • mto: This revision was merged to the branch mainline in revision 2109.
  • Revision ID: kalebral@gmail.com-20110124171911-4xztwcdk7i65osyd
Merge Andrew - fix bug 619992: fix disabled unittests 
Merge Andrew - fix bug #667162: port unittests to boost::test   

Show diffs side-by-side

added added

removed removed

Lines of Context:
unittests/main.cc
1
1
/* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2010 Stewart Smith
 
4
 *  Copyright (C) 2011 Andrew Hutchings
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "config.h"
22
 
 
23
 
#include <gtest/gtest.h>
24
 
 
25
 
#include <drizzled/internal/my_sys.h>
26
 
 
27
 
int main(int argc, char **argv)
28
 
{
29
 
        MY_INIT(argv[0]);
30
 
  ::testing::InitGoogleTest(&argc, argv);
31
 
  return RUN_ALL_TESTS();
 
21
#define BOOST_TEST_DYN_LINK
 
22
#define BOOST_TEST_MAIN
 
23
#include <boost/test/unit_test.hpp>
 
24
#include <iostream>
 
25
 
 
26
struct MyConfig
 
27
{
 
28
    MyConfig()
 
29
    {
 
30
       boost::unit_test::unit_test_log.set_threshold_level(boost::unit_test::log_messages);
 
31
    }
 
32
 
 
33
    ~MyConfig()
 
34
    {
 
35
    }
 
36
};
 
37
 
 
38
BOOST_GLOBAL_FIXTURE( MyConfig )
 
39
 
 
40
BOOST_AUTO_TEST_CASE(MainInit)
 
41
{
 
42
  BOOST_REQUIRE(true);
32
43
}