← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Brian Aker
  • Date: 2008-07-02 15:58:43 UTC
  • mfrom: (37.1.1 remove_unittest)
  • Revision ID: brian@tangent.org-20080702155843-b30y15sirrcb874u
Removing unittest (merge from patg's tree)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
22
22
 
23
23
SUBDIRS =               . include \
24
24
                        sql-common scripts vio \
25
 
                        @sql_union_dirs@ unittest storage plugin \
 
25
                        @sql_union_dirs@ storage plugin \
26
26
                        @sql_server@ tests \
27
27
                        mysql-test support-files
28
28
 
30
30
                        sql-common scripts vio \
31
31
                        strings mysys dbug mysys/tests strings/tests \
32
32
                        extra regex \
33
 
                        libmysql client unittest storage plugin \
 
33
                        libmysql client storage plugin \
34
34
                        sql tests \
35
35
                        mysql-test support-files
36
36
 
46
46
.PHONY: init-db bin-dist \
47
47
  test    test-force    test-full    test-force-full    test-force-mem \
48
48
  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \
49
 
  test-unit test-ps test-nr test-pr test-ns test-binlog-statement \
 
49
  test-ps test-nr test-pr test-ns test-binlog-statement \
50
50
  test-ext-funcs test-ext-rpl test-ext-jp \
51
51
  test-ext-stress test-ext test-embedded \
52
52
  test-fast test-fast-cursor test-fast-view test-fast-prepare \
60
60
# will then calculate the various port numbers it needs from this,
61
61
# making sure each user use different ports.
62
62
 
63
 
test-unit:
64
 
        cd unittest && $(MAKE) test
65
 
 
66
63
test-ps:
67
64
        cd mysql-test ; \
68
65
            @PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed
83
80
        cd mysql-test ; \
84
81
            @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
85
82
 
86
 
test:   test-unit test-ns test-pr
 
83
test:   test-ns test-pr
87
84
 
88
85
test-full:      test test-nr test-ps
89
86
 
168
165
test-full-qa:
169
166
        $(MAKE) force=--force test-pr \
170
167
            test-binlog-statement test-ext test-fast-view \
171
 
                test-fast-cursor test-unit
 
168
                test-fast-cursor