Merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes into lp:libdrizzle
- 5.1-compiler-fixes
- Merge into libdrizzle-redux
Proposed by
Andrew Hutchings
Status: | Merged |
---|---|
Approved by: | Andrew Hutchings |
Approved revision: | no longer in the source branch. |
Merged at revision: | 120 |
Proposed branch: | lp:~linuxjedi/libdrizzle/5.1-compiler-fixes |
Merge into: | lp:libdrizzle |
Diff against target: |
258 lines (+35/-16) 6 files modified
libdrizzle/binlog.cc (+2/-2) libdrizzle/conn.cc (+2/-2) libdrizzle/field.cc (+2/-2) libdrizzle/statement_param.cc (+8/-8) m4/ax_harden_compiler_flags.m4 (+4/-2) tests/unit/include.am (+17/-0) |
To merge this branch: | bzr merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Drizzle Trunk | Pending | ||
Review via email: mp+161236@code.launchpad.net |
Commit message
Description of the change
Fixes for clang and mingw compiling
To post a comment you must log in.
- 120. By Drizzle Continuous Integration
-
Merge lp:~linuxjedi/libdrizzle/5.1-compiler-fixes Build: jenkins-
Libdrizzle- 94
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'libdrizzle/binlog.cc' | |||
2 | --- libdrizzle/binlog.cc 2013-03-25 21:23:36 +0000 | |||
3 | +++ libdrizzle/binlog.cc 2013-04-26 20:55:33 +0000 | |||
4 | @@ -316,7 +316,7 @@ | |||
5 | 316 | if (con->packet_size != binlog_event->length) | 316 | if (con->packet_size != binlog_event->length) |
6 | 317 | { | 317 | { |
7 | 318 | drizzle_set_error(con, "drizzle_state_binlog_read", | 318 | drizzle_set_error(con, "drizzle_state_binlog_read", |
9 | 319 | "packet size error:%"PRIu32":%"PRIu32, con->packet_size, binlog_event->length); | 319 | "packet size error:%" PRIu32 ":%" PRIu32, con->packet_size, binlog_event->length); |
10 | 320 | con->binlog->error_fn(DRIZZLE_RETURN_UNEXPECTED_DATA, con, con->binlog->binlog_context); | 320 | con->binlog->error_fn(DRIZZLE_RETURN_UNEXPECTED_DATA, con, con->binlog->binlog_context); |
11 | 321 | return DRIZZLE_RETURN_UNEXPECTED_DATA; | 321 | return DRIZZLE_RETURN_UNEXPECTED_DATA; |
12 | 322 | } | 322 | } |
13 | @@ -374,7 +374,7 @@ | |||
14 | 374 | event_crc= (uint32_t)crc32(0, binlog_event->raw_data, (binlog_event->raw_length - DRIZZLE_BINLOG_CRC32_LEN)); | 374 | event_crc= (uint32_t)crc32(0, binlog_event->raw_data, (binlog_event->raw_length - DRIZZLE_BINLOG_CRC32_LEN)); |
15 | 375 | if (event_crc != binlog_event->checksum) | 375 | if (event_crc != binlog_event->checksum) |
16 | 376 | { | 376 | { |
18 | 377 | drizzle_set_error(con, __func__, "CRC doesn't match: 0x%"PRIX32", 0x%"PRIX32, event_crc, binlog_event->checksum); | 377 | drizzle_set_error(con, __func__, "CRC doesn't match: 0x%" PRIX32 ", 0x%" PRIX32, event_crc, binlog_event->checksum); |
19 | 378 | con->binlog->error_fn(DRIZZLE_RETURN_BINLOG_CRC, con, con->binlog->binlog_context); | 378 | con->binlog->error_fn(DRIZZLE_RETURN_BINLOG_CRC, con, con->binlog->binlog_context); |
20 | 379 | return DRIZZLE_RETURN_BINLOG_CRC; | 379 | return DRIZZLE_RETURN_BINLOG_CRC; |
21 | 380 | } | 380 | } |
22 | 381 | 381 | ||
23 | === modified file 'libdrizzle/conn.cc' | |||
24 | --- libdrizzle/conn.cc 2013-03-25 21:44:12 +0000 | |||
25 | +++ libdrizzle/conn.cc 2013-04-26 20:55:33 +0000 | |||
26 | @@ -1445,7 +1445,7 @@ | |||
27 | 1445 | return DRIZZLE_RETURN_INVALID_ARGUMENT; | 1445 | return DRIZZLE_RETURN_INVALID_ARGUMENT; |
28 | 1446 | } | 1446 | } |
29 | 1447 | 1447 | ||
31 | 1448 | #if HAVE_FCNTL && !defined(SOCK_CLOEXEC) && defined(FD_CLOEXEC) | 1448 | #if defined(HAVE_FCNTL) && !defined(SOCK_CLOEXEC) && defined(FD_CLOEXEC) |
32 | 1449 | { | 1449 | { |
33 | 1450 | int flags; | 1450 | int flags; |
34 | 1451 | do | 1451 | do |
35 | @@ -1561,7 +1561,7 @@ | |||
36 | 1561 | drizzle_set_error(con, __func__, "setsockopt(SO_NOSIGPIPE): %s", strerror(errno)); | 1561 | drizzle_set_error(con, __func__, "setsockopt(SO_NOSIGPIPE): %s", strerror(errno)); |
37 | 1562 | return DRIZZLE_RETURN_ERRNO; | 1562 | return DRIZZLE_RETURN_ERRNO; |
38 | 1563 | } | 1563 | } |
40 | 1564 | #elif HAVE_FCNTL && defined(F_SETNOSIGPIPE) | 1564 | #elif defined(HAVE_FCNTL) && defined(F_SETNOSIGPIPE) |
41 | 1565 | ret= fcntl(con->fd, F_SETNOSIGPIPE, 1); | 1565 | ret= fcntl(con->fd, F_SETNOSIGPIPE, 1); |
42 | 1566 | 1566 | ||
43 | 1567 | if (ret == -1) | 1567 | if (ret == -1) |
44 | 1568 | 1568 | ||
45 | === modified file 'libdrizzle/field.cc' | |||
46 | --- libdrizzle/field.cc 2013-04-25 13:04:25 +0000 | |||
47 | +++ libdrizzle/field.cc 2013-04-26 20:55:33 +0000 | |||
48 | @@ -239,7 +239,7 @@ | |||
49 | 239 | } | 239 | } |
50 | 240 | 240 | ||
51 | 241 | drizzle_log_debug(con, | 241 | drizzle_log_debug(con, |
53 | 242 | "field_offset= %"PRIu64", field_size= %zu, field_total= %"PRIu64, | 242 | "field_offset= %" PRIu64 ", field_size= %zu, field_total= %" PRIu64, |
54 | 243 | con->result->field_offset, con->result->field_size, | 243 | con->result->field_offset, con->result->field_size, |
55 | 244 | con->result->field_total); | 244 | con->result->field_total); |
56 | 245 | 245 | ||
57 | @@ -295,7 +295,7 @@ | |||
58 | 295 | con->packet_size-= con->result->field_size; | 295 | con->packet_size-= con->result->field_size; |
59 | 296 | 296 | ||
60 | 297 | drizzle_log_debug(con, | 297 | drizzle_log_debug(con, |
62 | 298 | "field_offset= %"PRIu64", field_size= %zu, field_total= %"PRIu64, | 298 | "field_offset= %" PRIu64 ", field_size= %zu, field_total= %" PRIu64, |
63 | 299 | con->result->field_offset, con->result->field_size, | 299 | con->result->field_offset, con->result->field_size, |
64 | 300 | con->result->field_total); | 300 | con->result->field_total); |
65 | 301 | 301 | ||
66 | 302 | 302 | ||
67 | === modified file 'libdrizzle/statement_param.cc' | |||
68 | --- libdrizzle/statement_param.cc 2013-04-25 10:15:18 +0000 | |||
69 | +++ libdrizzle/statement_param.cc 2013-04-26 20:55:33 +0000 | |||
70 | @@ -599,11 +599,11 @@ | |||
71 | 599 | char* buffer= param->data_buffer + 50; | 599 | char* buffer= param->data_buffer + 50; |
72 | 600 | if (param->options.is_unsigned) | 600 | if (param->options.is_unsigned) |
73 | 601 | { | 601 | { |
75 | 602 | snprintf(buffer, 12, "%"PRIu32, val); | 602 | snprintf(buffer, 12, "%" PRIu32, val); |
76 | 603 | } | 603 | } |
77 | 604 | else | 604 | else |
78 | 605 | { | 605 | { |
80 | 606 | snprintf(buffer, 12, "%"PRId32, (int32_t)val); | 606 | snprintf(buffer, 12, "%" PRId32, (int32_t)val); |
81 | 607 | } | 607 | } |
82 | 608 | return buffer; | 608 | return buffer; |
83 | 609 | } | 609 | } |
84 | @@ -614,11 +614,11 @@ | |||
85 | 614 | char* buffer= param->data_buffer + 50; | 614 | char* buffer= param->data_buffer + 50; |
86 | 615 | if (param->options.is_unsigned) | 615 | if (param->options.is_unsigned) |
87 | 616 | { | 616 | { |
89 | 617 | snprintf(buffer, 21, "%"PRIu64, val); | 617 | snprintf(buffer, 21, "%" PRIu64, val); |
90 | 618 | } | 618 | } |
91 | 619 | else | 619 | else |
92 | 620 | { | 620 | { |
94 | 621 | snprintf(buffer, 21, "%"PRId64, (int64_t)val); | 621 | snprintf(buffer, 21, "%" PRId64, (int64_t)val); |
95 | 622 | } | 622 | } |
96 | 623 | return buffer; | 623 | return buffer; |
97 | 624 | } | 624 | } |
98 | @@ -639,7 +639,7 @@ | |||
99 | 639 | int used = 0; | 639 | int used = 0; |
100 | 640 | 640 | ||
101 | 641 | /* Values are transferred with days separated from hours, but presented with days folded into hours. */ | 641 | /* Values are transferred with days separated from hours, but presented with days folded into hours. */ |
103 | 642 | used = snprintf(buffer, buffersize-used, "%s%02u:%02"PRIu8":%02"PRIu8, (time->negative) ? "-" : "", time->hour + 24 * time->day, time->minute, time->second); | 642 | used = snprintf(buffer, buffersize-used, "%s%02u:%02" PRIu8 ":%02" PRIu8, (time->negative) ? "-" : "", time->hour + 24 * time->day, time->minute, time->second); |
104 | 643 | 643 | ||
105 | 644 | /* TODO: the existence (and length) of the decimals should be decided based on the number of fields sent by the server or possibly the column's "decimals" value, not by whether the microseconds are 0 */ | 644 | /* TODO: the existence (and length) of the decimals should be decided based on the number of fields sent by the server or possibly the column's "decimals" value, not by whether the microseconds are 0 */ |
106 | 645 | if (time->microsecond || time->show_microseconds) | 645 | if (time->microsecond || time->show_microseconds) |
107 | @@ -657,19 +657,19 @@ | |||
108 | 657 | int buffersize = 27; | 657 | int buffersize = 27; |
109 | 658 | int used = 0; | 658 | int used = 0; |
110 | 659 | 659 | ||
112 | 660 | used += snprintf(buffer, buffersize-used, "%04"PRIu16"-%02"PRIu8"-%02"PRIu32, | 660 | used += snprintf(buffer, buffersize-used, "%04" PRIu16 "-%02" PRIu8 "-%02" PRIu32, |
113 | 661 | timestamp->year, timestamp->month, timestamp->day); | 661 | timestamp->year, timestamp->month, timestamp->day); |
114 | 662 | assert(used < buffersize); | 662 | assert(used < buffersize); |
115 | 663 | 663 | ||
116 | 664 | if (param->type == DRIZZLE_COLUMN_TYPE_DATE) | 664 | if (param->type == DRIZZLE_COLUMN_TYPE_DATE) |
117 | 665 | return buffer; | 665 | return buffer; |
118 | 666 | 666 | ||
120 | 667 | used += snprintf(buffer+used, buffersize-used, " %02"PRIu16":%02"PRIu8":%02"PRIu8, | 667 | used += snprintf(buffer+used, buffersize-used, " %02" PRIu16 ":%02" PRIu8 ":%02" PRIu8, |
121 | 668 | timestamp->hour, timestamp->minute, timestamp->second); | 668 | timestamp->hour, timestamp->minute, timestamp->second); |
122 | 669 | 669 | ||
123 | 670 | if (timestamp->microsecond || timestamp->show_microseconds) | 670 | if (timestamp->microsecond || timestamp->show_microseconds) |
124 | 671 | { | 671 | { |
126 | 672 | used += snprintf(buffer+used, buffersize-used, ".%06"PRIu32, timestamp->microsecond); | 672 | used += snprintf(buffer+used, buffersize-used, ".%06" PRIu32, timestamp->microsecond); |
127 | 673 | } | 673 | } |
128 | 674 | 674 | ||
129 | 675 | assert(used < buffersize); | 675 | assert(used < buffersize); |
130 | 676 | 676 | ||
131 | === modified file 'm4/ax_harden_compiler_flags.m4' | |||
132 | --- m4/ax_harden_compiler_flags.m4 2013-01-10 12:04:23 +0000 | |||
133 | +++ m4/ax_harden_compiler_flags.m4 2013-04-26 20:55:33 +0000 | |||
134 | @@ -102,7 +102,8 @@ | |||
135 | 102 | _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail]) | 102 | _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail]) |
136 | 103 | _APPEND_COMPILE_FLAGS_ERROR([-std=c99]) | 103 | _APPEND_COMPILE_FLAGS_ERROR([-std=c99]) |
137 | 104 | # Anything below this comment please keep sorted. | 104 | # Anything below this comment please keep sorted. |
139 | 105 | _APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1]) | 105 | AS_IF([test "x$CC_VERSION_VENDOR" != xclang], |
140 | 106 | [_APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1])], []) | ||
141 | 106 | # _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute]) | 107 | # _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute]) |
142 | 107 | _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes]) | 108 | _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes]) |
143 | 108 | _APPEND_COMPILE_FLAGS_ERROR([-Waddress]) | 109 | _APPEND_COMPILE_FLAGS_ERROR([-Waddress]) |
144 | @@ -187,7 +188,8 @@ | |||
145 | 187 | _APPEND_COMPILE_FLAGS_ERROR([-Wunknown-pragmas]) | 188 | _APPEND_COMPILE_FLAGS_ERROR([-Wunknown-pragmas]) |
146 | 188 | _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail]) | 189 | _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail]) |
147 | 189 | # Anything below this comment please keep sorted. | 190 | # Anything below this comment please keep sorted. |
149 | 190 | _APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1]) | 191 | AS_IF([test "x$CXX_VERSION_VENDOR" != xclang], |
150 | 192 | [_APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1])], []) | ||
151 | 191 | # _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute]) | 193 | # _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute]) |
152 | 192 | _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes]) | 194 | _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes]) |
153 | 193 | _APPEND_COMPILE_FLAGS_ERROR([-Waddress]) | 195 | _APPEND_COMPILE_FLAGS_ERROR([-Waddress]) |
154 | 194 | 196 | ||
155 | === modified file 'tests/unit/include.am' | |||
156 | --- tests/unit/include.am 2013-04-25 10:15:18 +0000 | |||
157 | +++ tests/unit/include.am 2013-04-26 20:55:33 +0000 | |||
158 | @@ -2,6 +2,9 @@ | |||
159 | 2 | # included from Top Level Makefile.am | 2 | # included from Top Level Makefile.am |
160 | 3 | # All paths should be given relative to the root | 3 | # All paths should be given relative to the root |
161 | 4 | 4 | ||
162 | 5 | # dummy.cxx is a hack to make MinGW link with C++ | ||
163 | 6 | # See http://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html | ||
164 | 7 | |||
165 | 5 | noinst_HEADERS+= tests/unit/common.h | 8 | noinst_HEADERS+= tests/unit/common.h |
166 | 6 | 9 | ||
167 | 7 | tests_unit_binlog_SOURCES= tests/unit/binlog.cc tests/unit/common.c | 10 | tests_unit_binlog_SOURCES= tests/unit/binlog.cc tests/unit/common.c |
168 | @@ -20,21 +23,25 @@ | |||
169 | 20 | 23 | ||
170 | 21 | tests_unit_escape_SOURCES= tests/unit/escape.c | 24 | tests_unit_escape_SOURCES= tests/unit/escape.c |
171 | 22 | tests_unit_escape_LDADD= libdrizzle/libdrizzle.la | 25 | tests_unit_escape_LDADD= libdrizzle/libdrizzle.la |
172 | 26 | nodist_EXTRA_tests_unit_escape_SOURCES = dummy.cxx | ||
173 | 23 | check_PROGRAMS+= tests/unit/escape | 27 | check_PROGRAMS+= tests/unit/escape |
174 | 24 | noinst_PROGRAMS+= tests/unit/escape | 28 | noinst_PROGRAMS+= tests/unit/escape |
175 | 25 | 29 | ||
176 | 26 | tests_unit_insert_id_SOURCES= tests/unit/insert_id.c | 30 | tests_unit_insert_id_SOURCES= tests/unit/insert_id.c |
177 | 27 | tests_unit_insert_id_LDADD= libdrizzle/libdrizzle.la | 31 | tests_unit_insert_id_LDADD= libdrizzle/libdrizzle.la |
178 | 32 | nodist_EXTRA_tests_unit_insert_id_SOURCES = dummy.cxx | ||
179 | 28 | check_PROGRAMS+= tests/unit/insert_id | 33 | check_PROGRAMS+= tests/unit/insert_id |
180 | 29 | noinst_PROGRAMS+= tests/unit/insert_id | 34 | noinst_PROGRAMS+= tests/unit/insert_id |
181 | 30 | 35 | ||
182 | 31 | tests_unit_query_SOURCES= tests/unit/query.c | 36 | tests_unit_query_SOURCES= tests/unit/query.c |
183 | 32 | tests_unit_query_LDADD= libdrizzle/libdrizzle.la | 37 | tests_unit_query_LDADD= libdrizzle/libdrizzle.la |
184 | 38 | nodist_EXTRA_tests_unit_query_SOURCES = dummy.cxx | ||
185 | 33 | check_PROGRAMS+= tests/unit/query | 39 | check_PROGRAMS+= tests/unit/query |
186 | 34 | noinst_PROGRAMS+= tests/unit/query | 40 | noinst_PROGRAMS+= tests/unit/query |
187 | 35 | 41 | ||
188 | 36 | tests_unit_column_SOURCES= tests/unit/column.c tests/unit/common.c | 42 | tests_unit_column_SOURCES= tests/unit/column.c tests/unit/common.c |
189 | 37 | tests_unit_column_LDADD= libdrizzle/libdrizzle.la | 43 | tests_unit_column_LDADD= libdrizzle/libdrizzle.la |
190 | 44 | nodist_EXTRA_tests_unit_column_SOURCES = dummy.cxx | ||
191 | 38 | check_PROGRAMS+= tests/unit/column | 45 | check_PROGRAMS+= tests/unit/column |
192 | 39 | noinst_PROGRAMS+= tests/unit/column | 46 | noinst_PROGRAMS+= tests/unit/column |
193 | 40 | 47 | ||
194 | @@ -50,26 +57,31 @@ | |||
195 | 50 | tests_unit_numbers_SOURCES= tests/unit/numbers.c tests/unit/common.c | 57 | tests_unit_numbers_SOURCES= tests/unit/numbers.c tests/unit/common.c |
196 | 51 | tests_unit_numbers_LDADD= libdrizzle/libdrizzle.la | 58 | tests_unit_numbers_LDADD= libdrizzle/libdrizzle.la |
197 | 52 | tests_unit_numbers_LDADD+= -lm | 59 | tests_unit_numbers_LDADD+= -lm |
198 | 60 | nodist_EXTRA_tests_unit_numbers_SOURCES = dummy.cxx | ||
199 | 53 | check_PROGRAMS+= tests/unit/numbers | 61 | check_PROGRAMS+= tests/unit/numbers |
200 | 54 | noinst_PROGRAMS+= tests/unit/numbers | 62 | noinst_PROGRAMS+= tests/unit/numbers |
201 | 55 | 63 | ||
202 | 56 | tests_unit_datetypes_SOURCES= tests/unit/datetypes.c tests/unit/common.c | 64 | tests_unit_datetypes_SOURCES= tests/unit/datetypes.c tests/unit/common.c |
203 | 57 | tests_unit_datetypes_LDADD= libdrizzle/libdrizzle.la | 65 | tests_unit_datetypes_LDADD= libdrizzle/libdrizzle.la |
204 | 66 | nodist_EXTRA_tests_unit_datetypes_SOURCES = dummy.cxx | ||
205 | 58 | check_PROGRAMS+= tests/unit/datetypes | 67 | check_PROGRAMS+= tests/unit/datetypes |
206 | 59 | noinst_PROGRAMS+= tests/unit/datetypes | 68 | noinst_PROGRAMS+= tests/unit/datetypes |
207 | 60 | 69 | ||
208 | 61 | tests_unit_nulls_SOURCES= tests/unit/nulls.c tests/unit/common.c | 70 | tests_unit_nulls_SOURCES= tests/unit/nulls.c tests/unit/common.c |
209 | 62 | tests_unit_nulls_LDADD= libdrizzle/libdrizzle.la | 71 | tests_unit_nulls_LDADD= libdrizzle/libdrizzle.la |
210 | 72 | nodist_EXTRA_tests_unit_nulls_SOURCES = dummy.cxx | ||
211 | 63 | check_PROGRAMS+= tests/unit/nulls | 73 | check_PROGRAMS+= tests/unit/nulls |
212 | 64 | noinst_PROGRAMS+= tests/unit/nulls | 74 | noinst_PROGRAMS+= tests/unit/nulls |
213 | 65 | 75 | ||
214 | 66 | tests_unit_row_SOURCES= tests/unit/row.c | 76 | tests_unit_row_SOURCES= tests/unit/row.c |
215 | 67 | tests_unit_row_LDADD= libdrizzle/libdrizzle.la | 77 | tests_unit_row_LDADD= libdrizzle/libdrizzle.la |
216 | 78 | nodist_EXTRA_tests_unit_row_SOURCES = dummy.cxx | ||
217 | 68 | check_PROGRAMS+= tests/unit/row | 79 | check_PROGRAMS+= tests/unit/row |
218 | 69 | noinst_PROGRAMS+= tests/unit/row | 80 | noinst_PROGRAMS+= tests/unit/row |
219 | 70 | 81 | ||
220 | 71 | tests_unit_version_SOURCES= tests/unit/version.c | 82 | tests_unit_version_SOURCES= tests/unit/version.c |
221 | 72 | tests_unit_version_LDADD= libdrizzle/libdrizzle.la | 83 | tests_unit_version_LDADD= libdrizzle/libdrizzle.la |
222 | 84 | nodist_EXTRA_tests_unit_version_SOURCES = dummy.cxx | ||
223 | 73 | check_PROGRAMS+= tests/unit/version | 85 | check_PROGRAMS+= tests/unit/version |
224 | 74 | noinst_PROGRAMS+= tests/unit/version | 86 | noinst_PROGRAMS+= tests/unit/version |
225 | 75 | 87 | ||
226 | @@ -80,6 +92,7 @@ | |||
227 | 80 | 92 | ||
228 | 81 | tests_unit_connect_SOURCES= tests/unit/connect.c | 93 | tests_unit_connect_SOURCES= tests/unit/connect.c |
229 | 82 | tests_unit_connect_LDADD= libdrizzle/libdrizzle.la | 94 | tests_unit_connect_LDADD= libdrizzle/libdrizzle.la |
230 | 95 | nodist_EXTRA_tests_unit_connect_SOURCES = dummy.cxx | ||
231 | 83 | check_PROGRAMS+= tests/unit/connect | 96 | check_PROGRAMS+= tests/unit/connect |
232 | 84 | noinst_PROGRAMS+= tests/unit/connect | 97 | noinst_PROGRAMS+= tests/unit/connect |
233 | 85 | 98 | ||
234 | @@ -94,21 +107,25 @@ | |||
235 | 94 | 107 | ||
236 | 95 | tests_unit_connect_uds_SOURCES= tests/unit/connect_uds.c tests/unit/common.c | 108 | tests_unit_connect_uds_SOURCES= tests/unit/connect_uds.c tests/unit/common.c |
237 | 96 | tests_unit_connect_uds_LDADD= libdrizzle/libdrizzle.la | 109 | tests_unit_connect_uds_LDADD= libdrizzle/libdrizzle.la |
238 | 110 | nodist_EXTRA_tests_unit_connect_uds_SOURCES = dummy.cxx | ||
239 | 97 | check_PROGRAMS+= tests/unit/connect_uds | 111 | check_PROGRAMS+= tests/unit/connect_uds |
240 | 98 | noinst_PROGRAMS+= tests/unit/connect_uds | 112 | noinst_PROGRAMS+= tests/unit/connect_uds |
241 | 99 | 113 | ||
242 | 100 | tests_unit_unbuffered_query_SOURCES= tests/unit/unbuffered_query.c | 114 | tests_unit_unbuffered_query_SOURCES= tests/unit/unbuffered_query.c |
243 | 101 | tests_unit_unbuffered_query_LDADD= libdrizzle/libdrizzle.la | 115 | tests_unit_unbuffered_query_LDADD= libdrizzle/libdrizzle.la |
244 | 116 | nodist_EXTRA_tests_unit_unbuffered_query_SOURCES = dummy.cxx | ||
245 | 102 | check_PROGRAMS+= tests/unit/unbuffered_query | 117 | check_PROGRAMS+= tests/unit/unbuffered_query |
246 | 103 | noinst_PROGRAMS+= tests/unit/unbuffered_query | 118 | noinst_PROGRAMS+= tests/unit/unbuffered_query |
247 | 104 | 119 | ||
248 | 105 | tests_unit_statement_SOURCES= tests/unit/statement.c | 120 | tests_unit_statement_SOURCES= tests/unit/statement.c |
249 | 106 | tests_unit_statement_LDADD= libdrizzle/libdrizzle.la | 121 | tests_unit_statement_LDADD= libdrizzle/libdrizzle.la |
250 | 122 | nodist_EXTRA_tests_unit_statement_SOURCES = dummy.cxx | ||
251 | 107 | check_PROGRAMS+= tests/unit/statement | 123 | check_PROGRAMS+= tests/unit/statement |
252 | 108 | noinst_PROGRAMS+= tests/unit/statement | 124 | noinst_PROGRAMS+= tests/unit/statement |
253 | 109 | 125 | ||
254 | 110 | tests_unit_statement_char_SOURCES= tests/unit/statement_char.c | 126 | tests_unit_statement_char_SOURCES= tests/unit/statement_char.c |
255 | 111 | tests_unit_statement_char_LDADD= libdrizzle/libdrizzle.la | 127 | tests_unit_statement_char_LDADD= libdrizzle/libdrizzle.la |
256 | 128 | nodist_EXTRA_tests_unit_statement_char_SOURCES = dummy.cxx | ||
257 | 112 | check_PROGRAMS+= tests/unit/statement_char | 129 | check_PROGRAMS+= tests/unit/statement_char |
258 | 113 | noinst_PROGRAMS+= tests/unit/statement_char | 130 | noinst_PROGRAMS+= tests/unit/statement_char |
259 | 114 | 131 |