← Back to branch summary

~patrick-crews/drizzle/qp-initial-cleanup

« back to all changes in this revision

Viewing changes to unittests/include.am

  • Committer: Continuous Integration
  • Date: 2012-04-23 09:10:11 UTC
  • mfrom: (2546.1.6 drizzle-greenlake)
  • Revision ID: ci@drizzle.org-20120423091011-occ5xj26cv99opu6
modified:
  client/conclusions.h
  client/drizzledump.cc
  client/drizzledump_data.h
  client/drizzledump_drizzle.cc
  client/drizzledump_mysql.cc
  client/drizzleimport.cc
  client/include.am
  client/option_string.h
  client/server_detect.cc
  client/statement.h
  client/stats.h
  client/thread_context.h
  drizzled/identifier/catalog.cc
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/table.cc
  drizzled/include.am
  drizzled/main.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/plugin.am
  plugin/innobase/tests/r/innodb-system-table-view.result
  plugin/tableprototester/tableprototester.cc
  tests/r/broken_table_proto_file.result
  unittests/include.am
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-23 Update to add in dependency for unittest

Show diffs side-by-side

added added

removed removed

Lines of Context:
unittests/include.am
18
18
#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 
20
20
if HAVE_BOOST_TEST
21
 
check_PROGRAMS += unittests/unittests
 
21
noinst_PROGRAMS+= unittests/unittests
22
22
endif
23
23
 
24
 
noinst_HEADERS += \
25
 
                  unittests/plugin/plugin_stubs.h \
26
 
                  unittests/temporal_generator.h
 
24
noinst_HEADERS+= unittests/plugin/plugin_stubs.h
 
25
noinst_HEADERS+= unittests/temporal_generator.h
27
26
 
28
27
unit: unittests/unittests
29
28
        unittests/unittests
33
32
#                     unittests/temporal_interval_test.cc
34
33
#                    
35
34
 
 
35
unittests_unittests_DEPENDENCIES=
 
36
unittests_unittests_DEPENDENCIES+= plugin/libmyisam_plugin.la
36
37
unittests_unittests_SOURCES = \
37
38
                              unittests/main.cc \
38
39
                              unittests/atomics_test.cc \