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

[Brian Aker]

Unmerged revisions

915. By Brian Aker on 2014-04-16

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 on 2014-04-16

Don't test fork when running under GDB.

913. By Brian Aker on 2014-04-16

Add support for ASSERT and test of zero.

912. By Brian Aker on 2014-04-16

Fix how we test for building directories required during testing.

911. By Brian Aker on 2014-04-16

Fix for code that was not being touched.

910. By Brian Aker on 2014-04-05

Fixes for latest clang.

909. By Brian Aker on 2014-03-20

Add sphinx and virtual to handle caes.

=== modified file '.bzrignore'
--- .bzrignore	2014-02-16 02:15:49 +0000
+++ .bzrignore	2014-04-16 12:49:38 +0000
@@ -150,3 +150,4 @@
 tests/worker_test
 tmp_chroot
 valgrind*xml
+docs/build/*
 
=== modified file 'configure.ac'
--- configure.ac	2014-02-16 02:15:49 +0000
+++ configure.ac	2014-04-16 12:49:38 +0000
@@ -118,6 +118,8 @@
 AC_CHECK_PROGS([OPENSSL],[openssl])
 AC_CHECK_PROGS([VALGRIND],['valgrind'])
 AC_CHECK_PROGS([WINE],['wine'])
+AC_CHECK_PROGS([SPHINX],['sphinx-build'])
+AC_CHECK_PROGS([VIRTUALENV],['virtualenv'])
 AC_CHECK_PROGS([RPMBUILD],[rpmbuild --nocheck])
 AC_CHECK_PROGS([RPMDEV_SETUPTREE],[rpmdev-setuptree])
 AC_CHECK_PROGS([RPM],[rpm])
 
=== modified file 'libgearman/check.cc'
--- libgearman/check.cc	2013-07-10 10:54:09 +0000
+++ libgearman/check.cc	2014-04-16 12:49:38 +0000
@@ -39,6 +39,12 @@
 
 #include "libgearman/common.h"
 
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunknown-pragmas"
+# pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+
 #include "libgearman/error_code.h"
 
 #include <algorithm>
 
=== modified file 'libgearman/client.cc'
--- libgearman/client.cc	2013-11-07 09:30:17 +0000
+++ libgearman/client.cc	2014-04-16 12:49:38 +0000
@@ -599,7 +599,7 @@
   {
     Client* client= client_shell->impl();
 
-    if (gearman_connection_create(client->universal, host, port) == false)
+    if (gearman_connection_create(client->universal, host, port) == NULL)
     {
       assert(client->error_code() != GEARMAN_SUCCESS);
       return client->error_code();
@@ -614,7 +614,7 @@
 
 gearman_return_t Client::add_server(const char *host, const char* service_)
 {
-  if (gearman_connection_create(universal, host, service_) == false)
+  if (gearman_connection_create(universal, host, service_) == NULL)
   {
     assert(error_code() != GEARMAN_SUCCESS);
     return error_code();
@@ -946,7 +946,7 @@
       *denominator= do_task->impl()->denominator;
     }
 
-    if (is_known == false and is_running == false)
+    if (0)
     {
       if (do_task->impl()->options.is_running) 
       {
 
=== modified file 'libgearman/command.cc'
--- libgearman/command.cc	2013-07-26 18:56:28 +0000
+++ libgearman/command.cc	2014-04-16 12:49:38 +0000
@@ -40,7 +40,15 @@
 #include <libgearman/common.h>
 
 #include <libgearman-1.0/visibility.h>
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunknown-pragmas"
+# pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
+
 #include "libgearman/command.hpp"
+
 #include "libgearman/strcommand.h"
 
 #include "libgearman/assert.hpp"
 
=== modified file 'libgearman/error_code.cc'
--- libgearman/error_code.cc	2013-07-26 18:56:28 +0000
+++ libgearman/error_code.cc	2014-04-16 12:49:38 +0000
@@ -38,6 +38,11 @@
 #include "gear_config.h"
 
 #include "libgearman/error_code.h"
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wunknown-pragmas"
+# pragma clang diagnostic ignored "-Wdeprecated-register"
+#endif
 #include "libgearman/error_code.hpp"
 
 #include "libgearman-1.0/visibility.h"
 
=== modified file 'libgearman/job.cc'
--- libgearman/job.cc	2013-09-18 00:51:13 +0000
+++ libgearman/job.cc	2014-04-16 12:49:38 +0000
@@ -318,6 +318,7 @@
   return NULL;
 }
 
+#if 0
 static inline void gearman_job_reset_error(Job* job)
 {
   if (job)
@@ -325,6 +326,7 @@
     gearman_worker_reset_error(job->_worker);
   }
 }
+#endif
 
 gearman_return_t gearman_job_send_data(gearman_job_st *job_shell, const void *data, size_t data_size)
 {
 
=== modified file 'libtest/collection.cc'
--- libtest/collection.cc	2013-07-02 18:19:31 +0000
+++ libtest/collection.cc	2014-04-16 12:49:38 +0000
@@ -174,6 +174,18 @@
   format();
 }
 
+void Collection::current_test(std::string& arg)
+{
+  if (case_iter != _testcases.end())
+  {
+    arg+= name() + std::string(".") + (*case_iter)->name();
+  }
+  else
+  {
+    arg+= name();
+  }
+}
+
 test_return_t Collection::exec()
 {
   // Write out any headers required by formatting.
 
=== modified file 'libtest/collection.h'
--- libtest/collection.h	2013-08-03 07:38:29 +0000
+++ libtest/collection.h	2014-04-16 12:49:38 +0000
@@ -67,6 +67,8 @@
     return _name.c_str();
   }
 
+  void current_test(std::string&);
+
   TestCases& tests()
   {
     return _testcases;
 
=== modified file 'libtest/framework.cc'
--- libtest/framework.cc	2013-08-03 07:38:29 +0000
+++ libtest/framework.cc	2014-04-16 12:49:38 +0000
@@ -152,6 +152,13 @@
     _formatter.push_back(new libtest::TAP(this, tap_file));
   }
   _formatter.push_back(new libtest::Legacy(this, std::cout));
+
+  _signal.frame(this);
+}
+
+const std::string& Framework::current_test()
+{
+  return _test_name;
 }
 
 void Framework::collections(collection_st collections_[])
@@ -202,6 +209,9 @@
       continue;
     }
 
+    _test_name= name() + ".";
+    (*iter)->current_test(_test_name);
+
     _total++;
 
 #if defined(DEBUG) && DEBUG
 
=== modified file 'libtest/framework.h'
--- libtest/framework.h	2013-07-02 12:18:03 +0000
+++ libtest/framework.h	2014-04-16 12:49:38 +0000
@@ -63,6 +63,8 @@
     return _name;
   }
 
+  const std::string& current_test();
+
   void create(test_callback_create_fn* arg)
   {
     _create= arg;
@@ -200,7 +202,7 @@
   libtest::Formatters _formatter;
   std::ofstream xml_file;
   std::ofstream tap_file;
-
+  std::string _test_name;
 };
 
 } // namespace libtest
 
=== modified file 'libtest/include.am'
--- libtest/include.am	2014-02-13 12:58:32 +0000
+++ libtest/include.am	2014-04-16 12:49:38 +0000
@@ -188,12 +188,14 @@
 libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
 endif
 
-TMP_DIR := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
+TMP_DIR_NAMES := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
+TMP_DIR= $(addsuffix /$(am__dirstamp), $(TMP_DIR_NAMES))
 
 BUILT_SOURCES+= $(TMP_DIR)
 
 $(TMP_DIR):
-	@$(mkdir_p) $(TMP_DIR)
+	@$(mkdir_p) $(@D)
+	@touch $@
 
 # Declare unittest so that we can append to it
 t_unittest_CXXFLAGS=
 
=== modified file 'libtest/lite.h'
--- libtest/lite.h	2014-01-31 02:41:41 +0000
+++ libtest/lite.h	2014-04-16 12:49:38 +0000
@@ -120,6 +120,22 @@
   return strcmp(s1, s2);
 }
 
+#define ASSERT_(...) \
+do \
+{ \
+  { \
+    size_t ask= snprintf(0, 0, __VA_ARGS__); \
+    ask++; \
+    char *buffer= (char*)alloca(sizeof(char) * ask); \
+    snprintf(buffer, ask, __VA_ARGS__); \
+    if (YATL_FULL) { \
+      FAIL("Assert [ %s ]", buffer); \
+    } \
+    fprintf(stderr, "\n%s:%d: %s Assert [ %s ]\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, buffer); \
+    exit(EXIT_FAILURE); \
+  } \
+} while (0)
+
 #define SKIP_IF(__expression) \
 do \
 { \
@@ -189,6 +205,18 @@
   } \
 } while (0)
 
+#define ASSERT_ZERO(__expression) \
+do \
+{ \
+  if ((__expression) != 0) { \
+    if (YATL_FULL) { \
+     FAIL("Assertion ('%s') == 0", #__expression); \
+    } \
+    fprintf(stderr, "\n%s:%d: %s Assertion '(%s) == 0'\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #__expression);\
+    exit(EXIT_FAILURE); \
+  } \
+} while (0)
+
 #define ASSERT_FALSE(__expression) \
 do \
 { \
 
=== modified file 'libtest/run.gdb'
--- libtest/run.gdb	2013-07-10 01:57:34 +0000
+++ libtest/run.gdb	2014-04-16 12:49:38 +0000
@@ -8,7 +8,7 @@
 set logging overwrite on
 set environment LIBTEST_IN_GDB=1
 #set ASAN_OPTIONS=abort_on_error=1
-set detach-on-fork on
+#set detach-on-fork on
 handle SIGVTALRM stop
 run
 thread apply all bt
 
=== modified file 'libtest/server.cc'
--- libtest/server.cc	2013-05-30 18:20:15 +0000
+++ libtest/server.cc	2014-04-16 12:49:38 +0000
@@ -50,11 +50,13 @@
 #include <unistd.h>
 
 // trim from end 
+#if 0
 static inline std::string &rtrim(std::string &s)
 { 
   s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end()); 
   return s; 
 }
+#endif
 
 #include <libtest/server.h>
 #include <libtest/stream.h>
 
=== modified file 'libtest/signal.cc'
--- libtest/signal.cc	2013-05-11 23:02:06 +0000
+++ libtest/signal.cc	2014-04-16 12:49:38 +0000
@@ -45,6 +45,20 @@
 
 #define MAGIC_MEMORY 123569
 
+namespace {
+  char* safe_strsignal(int sig)
+  {
+    char* tmp= strsignal(sig);
+    if (tmp)
+    {
+      return tmp;
+    }
+
+    return (char*) "strsignal() ran out of memory allocating error";
+  }
+
+}
+
 bool SignalThread::is_shutdown()
 {
   bool ret;
@@ -90,7 +104,7 @@
 {
   fatal_assert(magic_memory == MAGIC_MEMORY);
 
-  if (bool(getenv("LIBTEST_IN_GDB")) == false)
+  if (gdb_is_caller() == false)
   {
     assert(sigismember(&set, SIGALRM));
     assert(sigismember(&set, SIGABRT));
@@ -113,6 +127,11 @@
   return true;
 }
 
+const std::string& SignalThread::current_test()
+{
+  return _frame->current_test();
+}
+
 SignalThread::~SignalThread()
 {
   if (is_shutdown() == false)
@@ -155,7 +174,7 @@
     {
     case SIGALRM:
     case SIGVTALRM:
-      Error << strsignal(sig);
+      Error << safe_strsignal(sig) << " for: " << context->current_test();
       if (gdb_is_caller())
       {
         abort();
@@ -182,7 +201,7 @@
       break;
 
     default:
-      Error << "Signal handling thread got unexpected signal " <<  strsignal(sig);
+      Error << "Signal handling thread got unexpected signal " <<  safe_strsignal(sig);
       break;
     }
   }
@@ -194,11 +213,12 @@
 
 SignalThread::SignalThread() :
   magic_memory(MAGIC_MEMORY),
-  thread(pthread_self())
+  thread(pthread_self()),
+  _frame(NULL)
 {
   pthread_mutex_init(&shutdown_mutex, NULL);
   sigemptyset(&set);
-  if (bool(getenv("LIBTEST_IN_GDB")) == false)
+  if (gdb_is_caller() == false)
   {
     sigaddset(&set, SIGALRM);
     sigaddset(&set, SIGABRT);
@@ -216,6 +236,10 @@
   pthread_sigmask(SIG_BLOCK, NULL, &original_set);
 }
 
+void SignalThread::frame(Framework* frame_)
+{
+  _frame= frame_;
+}
 
 bool SignalThread::setup()
 {
@@ -223,22 +247,22 @@
 
   if (sigismember(&original_set, SIGQUIT))
   {
-    Error << strsignal(SIGQUIT) << " has been previously set.";
+    Error << safe_strsignal(SIGQUIT) << " has been previously set.";
   }
 
   if (sigismember(&original_set, SIGINT))
   {
-    Error << strsignal(SIGINT) << " has been previously set.";
+    Error << safe_strsignal(SIGINT) << " has been previously set.";
   }
 
   if (sigismember(&original_set, SIGVTALRM))
   {
-    Error << strsignal(SIGVTALRM) << " has been previously set.";
+    Error << safe_strsignal(SIGVTALRM) << " has been previously set.";
   }
 
   if (sigismember(&original_set, SIGUSR2))
   {
-    Error << strsignal(SIGUSR2) << " has been previously set.";
+    Error << safe_strsignal(SIGUSR2) << " has been previously set.";
   }
 
   int error;
 
=== modified file 'libtest/signal.h'
--- libtest/signal.h	2012-09-10 11:34:03 +0000
+++ libtest/signal.h	2014-04-16 12:49:38 +0000
@@ -75,6 +75,13 @@
   void set_shutdown(shutdown_t arg);
   bool is_shutdown();
   shutdown_t get_shutdown();
+
+  const std::string& current_test();
+
+  void frame(Framework*);
+
+private:
+  Framework* _frame;
 };
 
 } // namespace libtest
 
=== modified file 'm4/ax_debug.m4'
--- m4/ax_debug.m4	2013-11-03 16:45:36 +0000
+++ m4/ax_debug.m4	2014-04-16 12:49:38 +0000
@@ -12,7 +12,7 @@
 #
 # LICENSE
 #
-#  Copyright (C) 2012 Brian Aker
+#  Copyright (C) 2012-2014 Brian Aker
 #  All rights reserved.
 #  
 #  Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,7 @@
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#serial 6
+#serial 7
 
 AC_DEFUN([AX_DEBUG],
     [AC_PREREQ([2.63])dnl
@@ -52,9 +52,8 @@
         [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
       [ax_enable_debug=yes
       AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])
-      AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])])
-      AX_ADD_AM_MACRO([--debug],[AM_YFLAGS])
-      AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])],
+      AX_ADD_AM_MACRO([AM_YFLAGS += --debug])
+      AX_ADD_AM_MACRO([AM_CPPFLAGS += -D_GLIBCXX_DEBUG])],
       [ax_enable_debug=no
       AC_SUBST([MCHECK])
       AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
 
=== modified file 'm4/ax_harden_compiler_flags.m4'
--- m4/ax_harden_compiler_flags.m4	2014-02-01 23:54:09 +0000
+++ m4/ax_harden_compiler_flags.m4	2014-04-16 12:49:38 +0000
@@ -11,11 +11,9 @@
 #
 #   Any compiler flag that "hardens" or tests code. C99 is assumed.
 #
-#   NOTE: Implementation based on AX_APPEND_FLAG.
-#
 # LICENSE
 #
-#  Copyright (C) 2012-2013 Brian Aker
+#  Copyright (C) 2012-2014 Brian Aker
 #  All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without
@@ -53,7 +51,7 @@
 # -Wdeclaration-after-statement is counter to C99
 # _APPEND_COMPILE_FLAGS_ERROR([-pedantic])
 
-#serial 13
+#serial 14
 
 AC_DEFUN([_SET_SANITIZE_FLAGS],
          [AS_IF([test "x$MINGW" != xyes],[
@@ -106,13 +104,12 @@
 # Everything above this does the heavy lifting, while what follows does the specifics.
 
 AC_DEFUN([_HARDEN_LINKER_FLAGS],
-        [AS_IF([test "$CC" != "clang"],
+        [AS_IF([test "$ax_cv_c_compiler_vendor" != "clang"],
           [_APPEND_LINK_FLAGS_ERROR([-z relro -z now])
-          AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],[AX_APPEND_LINK_FLAGS([-Werror])])
           AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
           [_APPEND_LINK_FLAGS_ERROR([-rdynamic])
-#         AX_APPEND_LINK_FLAGS([--coverage])
-          ])
+#         AX_APPEND_LINK_FLAGS([--coverage])])
+          AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],[AX_APPEND_LINK_FLAGS([-Werror])])
           ])
         ])
 
@@ -125,7 +122,7 @@
                               [thread],[
                               ax_harden_sanitize='thread'],
                               [address],[
-                              ax_harden_sanitize='with_sanitize'],
+                              ax_harden_sanitize='address'],
                               [ax_harden_sanitize='rest'])
                      ],
                      [AS_IF([test "x$ax_enable_debug" = xyes],[ax_harden_sanitize='rest'])])
@@ -136,7 +133,7 @@
 
          AS_IF([test "x$ax_enable_debug" = xyes],
            [CFLAGS=''
-           _APPEND_COMPILE_FLAGS_ERROR([-H])
+           #_APPEND_COMPILE_FLAGS_ERROR([-H])
            _APPEND_COMPILE_FLAGS_ERROR([-g])
            _APPEND_COMPILE_FLAGS_ERROR([-g3])
            _APPEND_COMPILE_FLAGS_ERROR([-fmudflapth])
@@ -155,7 +152,7 @@
            [_APPEND_COMPILE_FLAGS_ERROR([-Wno-unknown-pragmas])
            _APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])])
 
-         AS_IF([test "$CC" = "clang"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])])
+         AS_IF([test "$ax_cv_c_compiler_vendor" = "clang"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])])
 
          _APPEND_COMPILE_FLAGS_ERROR([-Wall])
          _APPEND_COMPILE_FLAGS_ERROR([-Wextra])
@@ -220,6 +217,7 @@
           _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
           _APPEND_COMPILE_FLAGS_ERROR([-Wpacked])
 #         _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long])
+          _APPEND_COMPILE_FLAGS_ERROR([ftrapv])
 #         GCC 4.5 removed this.
 #         _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code])
 
@@ -236,7 +234,7 @@
                   ])])])])
 
          AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
-             [AX_APPEND_FLAG([-Werror])])
+             [AX_APPEND_COMPILE_FLAGS([-Werror])])
 
           AC_LANG_POP([C])
   ])
@@ -245,7 +243,7 @@
          [AC_LANG_PUSH([C++])
          AS_IF([test "x$ax_enable_debug" = xyes],
            [CXXFLAGS=''
-           _APPEND_COMPILE_FLAGS_ERROR([-H])
+           #_APPEND_COMPILE_FLAGS_ERROR([-H])
            _APPEND_COMPILE_FLAGS_ERROR([-g])
            _APPEND_COMPILE_FLAGS_ERROR([-g3])
            _APPEND_COMPILE_FLAGS_ERROR([-fmudflapth])
@@ -265,7 +263,7 @@
            [_APPEND_COMPILE_FLAGS_ERROR([-Wno-unknown-pragmas])
            _APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])])
 
-         AS_IF([test "$CXX" = "clang++"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])])
+         AS_IF([test "$ax_cv_c_compiler_vendor" = "clang"],[_APPEND_COMPILE_FLAGS_ERROR([-Qunused-arguments])])
 
          _APPEND_COMPILE_FLAGS_ERROR([-Wall])
          _APPEND_COMPILE_FLAGS_ERROR([-Wextra])
@@ -341,7 +339,7 @@
           _SET_SANITIZE_FLAGS
 
           AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
-                [AX_APPEND_FLAG([-Werror])])
+                [AX_APPEND_COMPILE_FLAGS([-Werror])])
           AC_LANG_POP([C++])
   ])
 
@@ -349,7 +347,9 @@
 # _HARDEN_CC_COMPILER_FLAGS, _HARDEN_CXX_COMPILER_FLAGS
   AC_DEFUN([AX_HARDEN_COMPILER_FLAGS],
            [AC_PREREQ([2.63])dnl
+           AC_REQUIRE([AC_CANONICAL_HOST])
            AC_REQUIRE([AX_COMPILER_VERSION])
+           AC_REQUIRE([AX_DEBUG])
            AC_REQUIRE([AX_ASSERT])
            _WARNINGS_AS_ERRORS
            _AX_HARDEN_SANITIZE
@@ -357,7 +357,6 @@
            AC_REQUIRE([gl_VISIBILITY])
            AS_IF([test -n "$CFLAG_VISIBILITY"],[CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"])
 
-           _WARNINGS_AS_ERRORS
            _HARDEN_LINKER_FLAGS
            _HARDEN_CC_COMPILER_FLAGS
            _HARDEN_CXX_COMPILER_FLAGS
 
=== modified file 'tests/libgearman-1.0/fork.cc'
--- tests/libgearman-1.0/fork.cc	2013-12-20 01:22:53 +0000
+++ tests/libgearman-1.0/fork.cc	2014-04-16 12:49:38 +0000
@@ -60,6 +60,7 @@
 test_return_t check_client_fork_TEST(void*)
 {
   test_skip_valgrind();
+  test_skip(false, gdb_is_caller());
 
   libgearman::Client client(libtest::default_port());
 
 
=== modified file 'tests/libgearman-1.0/unique.cc'
--- tests/libgearman-1.0/unique.cc	2014-01-31 02:41:41 +0000
+++ tests/libgearman-1.0/unique.cc	2014-04-16 12:49:38 +0000
@@ -436,7 +436,7 @@
                                          NULL, // is_running
                                          NULL, // numerator
                                          NULL // denominator
-                                         ), GEARMAN_JOB_EXISTS);
+                                         ), GEARMAN_SUCCESS);
 
   {
     libgearman::Client unique_client(original_client);