← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to unittests/include.am

  • 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/include.am
17
17
#  along with this program; if not, write to the Free Software
18
18
#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 
20
 
 
21
 
if HAVE_LIBGTEST
 
20
if HAVE_BOOST_TEST
22
21
check_PROGRAMS += unittests/unittests
23
22
endif
24
23
 
26
25
                  unittests/plugin/plugin_stubs.h \
27
26
                  unittests/temporal_generator.h
28
27
 
29
 
EXTRA_DIST += \
30
 
              unittests/client_server.c
31
 
 
32
28
unit: unittests/unittests
33
29
        unittests/unittests
34
30
 
38
34
#                    
39
35
 
40
36
unittests_unittests_SOURCES = \
 
37
                              unittests/main.cc \
41
38
                              unittests/atomics_test.cc \
42
39
                              unittests/calendar_test.cc \
43
40
                              unittests/constrained_value.cc \
44
41
                              unittests/date_test.cc \
45
42
                              unittests/date_time_test.cc \
46
 
                              unittests/generators.cc \
47
 
                              unittests/global_buffer_test.cc \
48
 
                              unittests/libdrizzle_test.cc \
49
 
                              unittests/main.cc \
 
43
                              unittests/global_buffer_test.cc \
 
44
                              unittests/libdrizzle_test.cc \
50
45
                              unittests/micro_timestamp_test.cc \
51
46
                              unittests/nano_timestamp_test.cc \
52
47
                              unittests/option_context.cc \
53
 
                              unittests/plugin/authentication_test.cc \
54
 
                              unittests/plugin/client_test.cc \
55
 
                              unittests/plugin/error_message_test.cc \
56
48
                              unittests/pthread_atomics_test.cc \
57
49
                              unittests/table_identifier.cc \
58
50
                              unittests/temporal_format_test.cc \
59
 
                              unittests/temporal_generator.cc \
 
51
                              unittests/temporal_generator.cc  \
 
52
                              unittests/timestamp_test.cc \
60
53
                              unittests/time_test.cc \
61
 
                              unittests/timestamp_test.cc \
62
54
                              unittests/utf8_test.cc
63
55
 
64
56
unittests_unittests_LDADD= \
65
57
  $(filter-out drizzled/main.$(OBJEXT), ${am_drizzled_drizzled_OBJECTS}) \
66
 
  ${drizzled_drizzled_LDADD} ${LTLIBGTEST} ${BOOST_LIBS} \
67
 
  libdrizzle/libdrizzle.la
 
58
  ${drizzled_drizzled_LDADD} ${BOOST_LIBS} libdrizzle/libdrizzle.la \
 
59
  ${LTLIBBOOST_UNIT_TEST_FRAMEWORK} ${LTLIBBOOST_UNIT_TEST_FRAMEWORK_MT}