Gearman

Merge lp:~brianaker/gearmand/current-osx-fixes into lp:gearmand

  1. current-osx-fixes
  2. Merge into 1.2
Proposed by Brian Aker
Status: Needs review
Proposed branch: lp:~brianaker/gearmand/current-osx-fixes
Merge into: lp:gearmand
Diff against target: 635 lines (+150/-38)
21 files modified
.bzrignore (+1/-0)
configure.ac (+2/-0)
libgearman/check.cc (+6/-0)
libgearman/client.cc (+3/-3)
libgearman/command.cc (+8/-0)
libgearman/error_code.cc (+5/-0)
libgearman/job.cc (+2/-0)
libtest/collection.cc (+12/-0)
libtest/collection.h (+2/-0)
libtest/framework.cc (+10/-0)
libtest/framework.h (+3/-1)
libtest/include.am (+4/-2)
libtest/lite.h (+28/-0)
libtest/run.gdb (+1/-1)
libtest/server.cc (+2/-0)
libtest/signal.cc (+33/-9)
libtest/signal.h (+7/-0)
m4/ax_debug.m4 (+4/-5)
m4/ax_harden_compiler_flags.m4 (+15/-16)
tests/libgearman-1.0/fork.cc (+1/-0)
tests/libgearman-1.0/unique.cc (+1/-1)
To merge this branch: bzr merge lp:~brianaker/gearmand/current-osx-fixes
Reviewer Review Type Date Requested Status
Tangent Trunk Pending
Review via email: mp+216087@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

915. By Brian Aker

Extend signal to tell which test blew up. Additionally in case where we run out of memory don't try allocating for strsignal.

914. By Brian Aker

Don't test fork when running under GDB.

913. By Brian Aker

Add support for ASSERT and test of zero.

912. By Brian Aker

Fix how we test for building directories required during testing.

911. By Brian Aker

Fix for code that was not being touched.

910. By Brian Aker

Fixes for latest clang.

909. By Brian Aker

Add sphinx and virtual to handle caes.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2014-02-16 02:15:49 +0000
3+++ .bzrignore 2014-04-16 12:49:38 +0000
4@@ -150,3 +150,4 @@
5 tests/worker_test
6 tmp_chroot
7 valgrind*xml
8+docs/build/*
9
10=== modified file 'configure.ac'
11--- configure.ac 2014-02-16 02:15:49 +0000
12+++ configure.ac 2014-04-16 12:49:38 +0000
13@@ -118,6 +118,8 @@
14 AC_CHECK_PROGS([OPENSSL],[openssl])
15 AC_CHECK_PROGS([VALGRIND],['valgrind'])
16 AC_CHECK_PROGS([WINE],['wine'])
17+AC_CHECK_PROGS([SPHINX],['sphinx-build'])
18+AC_CHECK_PROGS([VIRTUALENV],['virtualenv'])
19 AC_CHECK_PROGS([RPMBUILD],[rpmbuild --nocheck])
20 AC_CHECK_PROGS([RPMDEV_SETUPTREE],[rpmdev-setuptree])
21 AC_CHECK_PROGS([RPM],[rpm])
22
23=== modified file 'libgearman/check.cc'
24--- libgearman/check.cc 2013-07-10 10:54:09 +0000
25+++ libgearman/check.cc 2014-04-16 12:49:38 +0000
26@@ -39,6 +39,12 @@
27
28 #include "libgearman/common.h"
29
30+#if defined(__clang__)
31+# pragma clang diagnostic push
32+# pragma clang diagnostic ignored "-Wunknown-pragmas"
33+# pragma clang diagnostic ignored "-Wdeprecated-register"
34+#endif
35+
36 #include "libgearman/error_code.h"
37
38 #include <algorithm>
39
40=== modified file 'libgearman/client.cc'
41--- libgearman/client.cc 2013-11-07 09:30:17 +0000
42+++ libgearman/client.cc 2014-04-16 12:49:38 +0000
43@@ -599,7 +599,7 @@
44 {
45 Client* client= client_shell->impl();
46
47- if (gearman_connection_create(client->universal, host, port) == false)
48+ if (gearman_connection_create(client->universal, host, port) == NULL)
49 {
50 assert(client->error_code() != GEARMAN_SUCCESS);
51 return client->error_code();
52@@ -614,7 +614,7 @@
53
54 gearman_return_t Client::add_server(const char *host, const char* service_)
55 {
56- if (gearman_connection_create(universal, host, service_) == false)
57+ if (gearman_connection_create(universal, host, service_) == NULL)
58 {
59 assert(error_code() != GEARMAN_SUCCESS);
60 return error_code();
61@@ -946,7 +946,7 @@
62 *denominator= do_task->impl()->denominator;
63 }
64
65- if (is_known == false and is_running == false)
66+ if (0)
67 {
68 if (do_task->impl()->options.is_running)
69 {
70
71=== modified file 'libgearman/command.cc'
72--- libgearman/command.cc 2013-07-26 18:56:28 +0000
73+++ libgearman/command.cc 2014-04-16 12:49:38 +0000
74@@ -40,7 +40,15 @@
75 #include <libgearman/common.h>
76
77 #include <libgearman-1.0/visibility.h>
78+
79+#if defined(__clang__)
80+# pragma clang diagnostic push
81+# pragma clang diagnostic ignored "-Wunknown-pragmas"
82+# pragma clang diagnostic ignored "-Wdeprecated-register"
83+#endif
84+
85 #include "libgearman/command.hpp"
86+
87 #include "libgearman/strcommand.h"
88
89 #include "libgearman/assert.hpp"
90
91=== modified file 'libgearman/error_code.cc'
92--- libgearman/error_code.cc 2013-07-26 18:56:28 +0000
93+++ libgearman/error_code.cc 2014-04-16 12:49:38 +0000
94@@ -38,6 +38,11 @@
95 #include "gear_config.h"
96
97 #include "libgearman/error_code.h"
98+#if defined(__clang__)
99+# pragma clang diagnostic push
100+# pragma clang diagnostic ignored "-Wunknown-pragmas"
101+# pragma clang diagnostic ignored "-Wdeprecated-register"
102+#endif
103 #include "libgearman/error_code.hpp"
104
105 #include "libgearman-1.0/visibility.h"
106
107=== modified file 'libgearman/job.cc'
108--- libgearman/job.cc 2013-09-18 00:51:13 +0000
109+++ libgearman/job.cc 2014-04-16 12:49:38 +0000
110@@ -318,6 +318,7 @@
111 return NULL;
112 }
113
114+#if 0
115 static inline void gearman_job_reset_error(Job* job)
116 {
117 if (job)
118@@ -325,6 +326,7 @@
119 gearman_worker_reset_error(job->_worker);
120 }
121 }
122+#endif
123
124 gearman_return_t gearman_job_send_data(gearman_job_st *job_shell, const void *data, size_t data_size)
125 {
126
127=== modified file 'libtest/collection.cc'
128--- libtest/collection.cc 2013-07-02 18:19:31 +0000
129+++ libtest/collection.cc 2014-04-16 12:49:38 +0000
130@@ -174,6 +174,18 @@
131 format();
132 }
133
134+void Collection::current_test(std::string& arg)
135+{
136+ if (case_iter != _testcases.end())
137+ {
138+ arg+= name() + std::string(".") + (*case_iter)->name();
139+ }
140+ else
141+ {
142+ arg+= name();
143+ }
144+}
145+
146 test_return_t Collection::exec()
147 {
148 // Write out any headers required by formatting.
149
150=== modified file 'libtest/collection.h'
151--- libtest/collection.h 2013-08-03 07:38:29 +0000
152+++ libtest/collection.h 2014-04-16 12:49:38 +0000
153@@ -67,6 +67,8 @@
154 return _name.c_str();
155 }
156
157+ void current_test(std::string&);
158+
159 TestCases& tests()
160 {
161 return _testcases;
162
163=== modified file 'libtest/framework.cc'
164--- libtest/framework.cc 2013-08-03 07:38:29 +0000
165+++ libtest/framework.cc 2014-04-16 12:49:38 +0000
166@@ -152,6 +152,13 @@
167 _formatter.push_back(new libtest::TAP(this, tap_file));
168 }
169 _formatter.push_back(new libtest::Legacy(this, std::cout));
170+
171+ _signal.frame(this);
172+}
173+
174+const std::string& Framework::current_test()
175+{
176+ return _test_name;
177 }
178
179 void Framework::collections(collection_st collections_[])
180@@ -202,6 +209,9 @@
181 continue;
182 }
183
184+ _test_name= name() + ".";
185+ (*iter)->current_test(_test_name);
186+
187 _total++;
188
189 #if defined(DEBUG) && DEBUG
190
191=== modified file 'libtest/framework.h'
192--- libtest/framework.h 2013-07-02 12:18:03 +0000
193+++ libtest/framework.h 2014-04-16 12:49:38 +0000
194@@ -63,6 +63,8 @@
195 return _name;
196 }
197
198+ const std::string& current_test();
199+
200 void create(test_callback_create_fn* arg)
201 {
202 _create= arg;
203@@ -200,7 +202,7 @@
204 libtest::Formatters _formatter;
205 std::ofstream xml_file;
206 std::ofstream tap_file;
207-
208+ std::string _test_name;
209 };
210
211 } // namespace libtest
212
213=== modified file 'libtest/include.am'
214--- libtest/include.am 2014-02-13 12:58:32 +0000
215+++ libtest/include.am 2014-04-16 12:49:38 +0000
216@@ -188,12 +188,14 @@
217 libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
218 endif
219
220-TMP_DIR := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
221+TMP_DIR_NAMES := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
222+TMP_DIR= $(addsuffix /$(am__dirstamp), $(TMP_DIR_NAMES))
223
224 BUILT_SOURCES+= $(TMP_DIR)
225
226 $(TMP_DIR):
227- @$(mkdir_p) $(TMP_DIR)
228+ @$(mkdir_p) $(@D)
229+ @touch $@
230
231 # Declare unittest so that we can append to it
232 t_unittest_CXXFLAGS=
233
234=== modified file 'libtest/lite.h'
235--- libtest/lite.h 2014-01-31 02:41:41 +0000
236+++ libtest/lite.h 2014-04-16 12:49:38 +0000
237@@ -120,6 +120,22 @@
238 return strcmp(s1, s2);
239 }
240
241+#define ASSERT_(...) \
242+do \
243+{ \
244+ { \
245+ size_t ask= snprintf(0, 0, __VA_ARGS__); \
246+ ask++; \
247+ char *buffer= (char*)alloca(sizeof(char) * ask); \
248+ snprintf(buffer, ask, __VA_ARGS__); \
249+ if (YATL_FULL) { \
250+ FAIL("Assert [ %s ]", buffer); \
251+ } \
252+ fprintf(stderr, "\n%s:%d: %s Assert [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, buffer); \
253+ exit(EXIT_FAILURE); \
254+ } \
255+} while (0)
256+
257 #define SKIP_IF(__expression) \
258 do \
259 { \
260@@ -189,6 +205,18 @@
261 } \
262 } while (0)
263
264+#define ASSERT_ZERO(__expression) \
265+do \
266+{ \
267+ if ((__expression) != 0) { \
268+ if (YATL_FULL) { \
269+ FAIL("Assertion ('%s') == 0", #__expression); \
270+ } \
271+ fprintf(stderr, "\n%s:%d: %s Assertion '(%s) == 0'\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression);\
272+ exit(EXIT_FAILURE); \
273+ } \
274+} while (0)
275+
276 #define ASSERT_FALSE(__expression) \
277 do \
278 { \
279
280=== modified file 'libtest/run.gdb'
281--- libtest/run.gdb 2013-07-10 01:57:34 +0000
282+++ libtest/run.gdb 2014-04-16 12:49:38 +0000
283@@ -8,7 +8,7 @@
284 set logging overwrite on
285 set environment LIBTEST_IN_GDB=1
286 #set ASAN_OPTIONS=abort_on_error=1
287-set detach-on-fork on
288+#set detach-on-fork on
289 handle SIGVTALRM stop
290 run
291 thread apply all bt
292
293=== modified file 'libtest/server.cc'
294--- libtest/server.cc 2013-05-30 18:20:15 +0000
295+++ libtest/server.cc 2014-04-16 12:49:38 +0000
296@@ -50,11 +50,13 @@
297 #include <unistd.h>
298
299 // trim from end
300+#if 0
301 static inline std::string &rtrim(std::string &s)
302 {
303 s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
304 return s;
305 }
306+#endif
307
308 #include <libtest/server.h>
309 #include <libtest/stream.h>
310
311=== modified file 'libtest/signal.cc'
312--- libtest/signal.cc 2013-05-11 23:02:06 +0000
313+++ libtest/signal.cc 2014-04-16 12:49:38 +0000
314@@ -45,6 +45,20 @@
315
316 #define MAGIC_MEMORY 123569
317
318+namespace {
319+ char* safe_strsignal(int sig)
320+ {
321+ char* tmp= strsignal(sig);
322+ if (tmp)
323+ {
324+ return tmp;
325+ }
326+
327+ return (char*) "strsignal() ran out of memory allocating error";
328+ }
329+
330+}
331+
332 bool SignalThread::is_shutdown()
333 {
334 bool ret;
335@@ -90,7 +104,7 @@
336 {
337 fatal_assert(magic_memory == MAGIC_MEMORY);
338
339- if (bool(getenv("LIBTEST_IN_GDB")) == false)
340+ if (gdb_is_caller() == false)
341 {
342 assert(sigismember(&set, SIGALRM));
343 assert(sigismember(&set, SIGABRT));
344@@ -113,6 +127,11 @@
345 return true;
346 }
347
348+const std::string& SignalThread::current_test()
349+{
350+ return _frame->current_test();
351+}
352+
353 SignalThread::~SignalThread()
354 {
355 if (is_shutdown() == false)
356@@ -155,7 +174,7 @@
357 {
358 case SIGALRM:
359 case SIGVTALRM:
360- Error << strsignal(sig);
361+ Error << safe_strsignal(sig) << " for: " << context->current_test();
362 if (gdb_is_caller())
363 {
364 abort();
365@@ -182,7 +201,7 @@
366 break;
367
368 default:
369- Error << "Signal handling thread got unexpected signal " << strsignal(sig);
370+ Error << "Signal handling thread got unexpected signal " << safe_strsignal(sig);
371 break;
372 }
373 }
374@@ -194,11 +213,12 @@
375
376 SignalThread::SignalThread() :
377 magic_memory(MAGIC_MEMORY),
378- thread(pthread_self())
379+ thread(pthread_self()),
380+ _frame(NULL)
381 {
382 pthread_mutex_init(&shutdown_mutex, NULL);
383 sigemptyset(&set);
384- if (bool(getenv("LIBTEST_IN_GDB")) == false)
385+ if (gdb_is_caller() == false)
386 {
387 sigaddset(&set, SIGALRM);
388 sigaddset(&set, SIGABRT);
389@@ -216,6 +236,10 @@
390 pthread_sigmask(SIG_BLOCK, NULL, &original_set);
391 }
392
393+void SignalThread::frame(Framework* frame_)
394+{
395+ _frame= frame_;
396+}
397
398 bool SignalThread::setup()
399 {
400@@ -223,22 +247,22 @@
401
402 if (sigismember(&original_set, SIGQUIT))
403 {
404- Error << strsignal(SIGQUIT) << " has been previously set.";
405+ Error << safe_strsignal(SIGQUIT) << " has been previously set.";
406 }
407
408 if (sigismember(&original_set, SIGINT))
409 {
410- Error << strsignal(SIGINT) << " has been previously set.";
411+ Error << safe_strsignal(SIGINT) << " has been previously set.";
412 }
413
414 if (sigismember(&original_set, SIGVTALRM))
415 {
416- Error << strsignal(SIGVTALRM) << " has been previously set.";
417+ Error << safe_strsignal(SIGVTALRM) << " has been previously set.";
418 }
419
420 if (sigismember(&original_set, SIGUSR2))
421 {
422- Error << strsignal(SIGUSR2) << " has been previously set.";
423+ Error << safe_strsignal(SIGUSR2) << " has been previously set.";
424 }
425
426 int error;
427
428=== modified file 'libtest/signal.h'
429--- libtest/signal.h 2012-09-10 11:34:03 +0000
430+++ libtest/signal.h 2014-04-16 12:49:38 +0000
431@@ -75,6 +75,13 @@
432 void set_shutdown(shutdown_t arg);
433 bool is_shutdown();
434 shutdown_t get_shutdown();
435+
436+ const std::string& current_test();
437+
438+ void frame(Framework*);
439+
440+private:
441+ Framework* _frame;
442 };
443
444 } // namespace libtest
445
446=== modified file 'm4/ax_debug.m4'
447--- m4/ax_debug.m4 2013-11-03 16:45:36 +0000
448+++ m4/ax_debug.m4 2014-04-16 12:49:38 +0000
449@@ -12,7 +12,7 @@
450 #
451 # LICENSE
452 #
453-# Copyright (C) 2012 Brian Aker
454+# Copyright (C) 2012-2014 Brian Aker
455 # All rights reserved.
456 #
457 # Redistribution and use in source and binary forms, with or without
458@@ -43,7 +43,7 @@
459 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
460 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
461
462-#serial 6
463+#serial 7
464
465 AC_DEFUN([AX_DEBUG],
466 [AC_PREREQ([2.63])dnl
467@@ -52,9 +52,8 @@
468 [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
469 [ax_enable_debug=yes
470 AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])
471- AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])])
472- AX_ADD_AM_MACRO([--debug],[AM_YFLAGS])
473- AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])],
474+ AX_ADD_AM_MACRO([AM_YFLAGS += --debug])
475+ AX_ADD_AM_MACRO([AM_CPPFLAGS += -D_GLIBCXX_DEBUG])],
476 [ax_enable_debug=no
477 AC_SUBST([MCHECK])
478 AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
479
480=== modified file 'm4/ax_harden_compiler_flags.m4'
481--- m4/ax_harden_compiler_flags.m4 2014-02-01 23:54:09 +0000
482+++ m4/ax_harden_compiler_flags.m4 2014-04-16 12:49:38 +0000
483@@ -11,11 +11,9 @@
484 #
485 # Any compiler flag that "hardens" or tests code. C99 is assumed.
486 #
487-# NOTE: Implementation based on AX_APPEND_FLAG.
488-#
489 # LICENSE
490 #
491-# Copyright (C) 2012-2013 Brian Aker
492+# Copyright (C) 2012-2014 Brian Aker
493 # All rights reserved.
494 #
495 # Redistribution and use in source and binary forms, with or without
496@@ -53,7 +51,7 @@
497 # -Wdeclaration-after-statement is counter to C99
498 # _APPEND_COMPILE_FLAGS_ERROR([-pedantic])
499
500-#serial 13
501+#serial 14
502
503 AC_DEFUN([_SET_SANITIZE_FLAGS],
504 [AS_IF([test "x$MINGW" != xyes],[
505@@ -106,13 +104,12 @@
506 # Everything above this does the heavy lifting, while what follows does the specifics.
507
508 AC_DEFUN([_HARDEN_LINKER_FLAGS],
509- [AS_IF([test "$CC" != "clang"],
510+ [AS_IF([test "$ax_cv_c_compiler_vendor" != "clang"],
511 [_APPEND_LINK_FLAGS_ERROR([-z relro -z now])
512- AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],[AX_APPEND_LINK_FLAGS([-Werror])])
513 AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
514 [_APPEND_LINK_FLAGS_ERROR([-rdynamic])
515-# AX_APPEND_LINK_FLAGS([--coverage])
516- ])
517+# AX_APPEND_LINK_FLAGS([--coverage])])
518+ AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],[AX_APPEND_LINK_FLAGS([-Werror])])
519 ])
520 ])
521
522@@ -125,7 +122,7 @@
523 [thread],[
524 ax_harden_sanitize='thread'],
525 [address],[
526- ax_harden_sanitize='with_sanitize'],
527+ ax_harden_sanitize='address'],
528 [ax_harden_sanitize='rest'])
529 ],
530 [AS_IF([test "x$ax_enable_debug" = xyes],[ax_harden_sanitize='rest'])])
531@@ -136,7 +133,7 @@
532
533 AS_IF([test "x$ax_enable_debug" = xyes],
534 [CFLAGS=''
535- _APPEND_COMPILE_FLAGS_ERROR([-H])
536+ #_APPEND_COMPILE_FLAGS_ERROR([-H])
537 _APPEND_COMPILE_FLAGS_ERROR([-g])
538 _APPEND_COMPILE_FLAGS_ERROR([-g3])
539 _APPEND_COMPILE_FLAGS_ERROR([-fmudflapth])
540@@ -155,7 +152,7 @@
541 [_APPEND_COMPILE_FLAGS_ERROR([-Wno-unknown-pragmas])
542 _APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])])
543
544- AS_IF([test "$CC" = "clang"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])])
545+ AS_IF([test "$ax_cv_c_compiler_vendor" = "clang"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])])
546
547 _APPEND_COMPILE_FLAGS_ERROR([-Wall])
548 _APPEND_COMPILE_FLAGS_ERROR([-Wextra])
549@@ -220,6 +217,7 @@
550 _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
551 _APPEND_COMPILE_FLAGS_ERROR([-Wpacked])
552 # _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long])
553+ _APPEND_COMPILE_FLAGS_ERROR([ftrapv])
554 # GCC 4.5 removed this.
555 # _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code])
556
557@@ -236,7 +234,7 @@
558 ])])])])
559
560 AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
561- [AX_APPEND_FLAG([-Werror])])
562+ [AX_APPEND_COMPILE_FLAGS([-Werror])])
563
564 AC_LANG_POP([C])
565 ])
566@@ -245,7 +243,7 @@
567 [AC_LANG_PUSH([C++])
568 AS_IF([test "x$ax_enable_debug" = xyes],
569 [CXXFLAGS=''
570- _APPEND_COMPILE_FLAGS_ERROR([-H])
571+ #_APPEND_COMPILE_FLAGS_ERROR([-H])
572 _APPEND_COMPILE_FLAGS_ERROR([-g])
573 _APPEND_COMPILE_FLAGS_ERROR([-g3])
574 _APPEND_COMPILE_FLAGS_ERROR([-fmudflapth])
575@@ -265,7 +263,7 @@
576 [_APPEND_COMPILE_FLAGS_ERROR([-Wno-unknown-pragmas])
577 _APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])])
578
579- AS_IF([test "$CXX" = "clang++"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])])
580+ AS_IF([test "$ax_cv_c_compiler_vendor" = "clang"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])])
581
582 _APPEND_COMPILE_FLAGS_ERROR([-Wall])
583 _APPEND_COMPILE_FLAGS_ERROR([-Wextra])
584@@ -341,7 +339,7 @@
585 _SET_SANITIZE_FLAGS
586
587 AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
588- [AX_APPEND_FLAG([-Werror])])
589+ [AX_APPEND_COMPILE_FLAGS([-Werror])])
590 AC_LANG_POP([C++])
591 ])
592
593@@ -349,7 +347,9 @@
594 # _HARDEN_CC_COMPILER_FLAGS, _HARDEN_CXX_COMPILER_FLAGS
595 AC_DEFUN([AX_HARDEN_COMPILER_FLAGS],
596 [AC_PREREQ([2.63])dnl
597+ AC_REQUIRE([AC_CANONICAL_HOST])
598 AC_REQUIRE([AX_COMPILER_VERSION])
599+ AC_REQUIRE([AX_DEBUG])
600 AC_REQUIRE([AX_ASSERT])
601 _WARNINGS_AS_ERRORS
602 _AX_HARDEN_SANITIZE
603@@ -357,7 +357,6 @@
604 AC_REQUIRE([gl_VISIBILITY])
605 AS_IF([test -n "$CFLAG_VISIBILITY"],[CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"])
606
607- _WARNINGS_AS_ERRORS
608 _HARDEN_LINKER_FLAGS
609 _HARDEN_CC_COMPILER_FLAGS
610 _HARDEN_CXX_COMPILER_FLAGS
611
612=== modified file 'tests/libgearman-1.0/fork.cc'
613--- tests/libgearman-1.0/fork.cc 2013-12-20 01:22:53 +0000
614+++ tests/libgearman-1.0/fork.cc 2014-04-16 12:49:38 +0000
615@@ -60,6 +60,7 @@
616 test_return_t check_client_fork_TEST(void*)
617 {
618 test_skip_valgrind();
619+ test_skip(false, gdb_is_caller());
620
621 libgearman::Client client(libtest::default_port());
622
623
624=== modified file 'tests/libgearman-1.0/unique.cc'
625--- tests/libgearman-1.0/unique.cc 2014-01-31 02:41:41 +0000
626+++ tests/libgearman-1.0/unique.cc 2014-04-16 12:49:38 +0000
627@@ -436,7 +436,7 @@
628 NULL, // is_running
629 NULL, // numerator
630 NULL // denominator
631- ), GEARMAN_JOB_EXISTS);
632+ ), GEARMAN_SUCCESS);
633
634 {
635 libgearman::Client unique_client(original_client);

Subscribers

People subscribed via source and target branches

to all changes: