Merge lp:~brianaker/gearmand/clocktime-option-check-fixes into lp:gearmand

[Brian Aker]

=== modified file 'configure.ac'
--- configure.ac	2013-07-09 08:48:15 +0000
+++ configure.ac	2013-07-10 10:57:30 +0000
@@ -205,7 +205,6 @@
 AC_CHECK_FUNCS([strtoul])
 AC_CHECK_FUNCS([uname])
 AC_CHECK_FUNCS([atexit])
-AC_CHECK_FUNCS([clock_gettime])
 AC_CHECK_FUNCS([getcwd])
 AC_CHECK_FUNCS([strstr])
 AC_CHECK_FUNC([setsockopt],[],[AC_CHECK_LIB([socket],[setsockopt])])
@@ -216,9 +215,15 @@
 
 # Check for -lrt
 AC_CHECK_LIB([rt],[clock_gettime],
-             [AC_SUBST([RT_LIB],[-lrt])
-             AC_DEFINE([HAVE_LIBRT],[1],[Have clock_gettime])
-             ])
+             [AX_SAVE_FLAGS
+              LIBS="$LIB -lrt"
+              AC_CHECK_FUNCS([clock_gettime])
+              AX_RESTORE_FLAGS
+
+              AC_SUBST([RT_LIB],[-lrt])
+              AC_DEFINE([HAVE_LIBRT],[1],[Have -lrt])
+             ],
+             [AC_CHECK_FUNCS([clock_gettime])])
 
 # Check for -lm
 LT_LIB_M
 
=== modified file 'libgearman-1.0/limits.h'
--- libgearman-1.0/limits.h	2012-05-13 23:19:56 +0000
+++ libgearman-1.0/limits.h	2013-07-10 10:57:30 +0000
@@ -49,6 +49,7 @@
 #define GEARMAN_MAXIMUM_INTEGER_DISPLAY_LENGTH 20
 #define GEARMAN_MAX_COMMAND_ARGS 8
 #define GEARMAN_MAX_ECHO_SIZE (UINT32_MAX -GEARMAN_ARGS_BUFFER_SIZE)
+#define GEARMAN_MAX_OPTION_SIZE (UINT32_MAX -GEARMAN_ARGS_BUFFER_SIZE)
 #define GEARMAN_MAX_ERROR_SIZE 2048
 #define GEARMAN_MAX_IDENTIFIER 254
 #define GEARMAN_MAX_UNIQUE_SIZE 64
 
=== modified file 'libgearman-server/gearmand_thread.cc'
--- libgearman-server/gearmand_thread.cc	2013-07-07 00:16:26 +0000
+++ libgearman-server/gearmand_thread.cc	2013-07-10 10:57:30 +0000
@@ -60,8 +60,8 @@
 #if defined(HAVE_PTHREAD_TIMEDJOIN_NP) && HAVE_PTHREAD_TIMEDJOIN_NP
 bool fill_timespec(struct timespec& ts)
 {
-#if defined(HAVE_LIBRT) && HAVE_LIBRT
-  if (HAVE_LIBRT) // This won't be called on OSX, etc,...
+#if defined(HAVE_CLOCK_GETTIME) && HAVE_CLOCK_GETTIME
+  if (HAVE_CLOCK_GETTIME) // This won't be called on OSX, etc,...
   {
     if (clock_gettime(CLOCK_REALTIME, &ts) == -1) 
     {
 
=== modified file 'libgearman-server/plugins/protocol/gear/protocol.cc'
--- libgearman-server/plugins/protocol/gear/protocol.cc	2013-07-07 00:23:12 +0000
+++ libgearman-server/plugins/protocol/gear/protocol.cc	2013-07-10 10:57:30 +0000
@@ -254,8 +254,8 @@
                          "GEAR length: %" PRIu64 " gearmand_command_t: %s option: %.*s",
                          uint64_t(packet->data_size),
                          gearman_strcommand(packet->command),
-                         int(packet->data_size),
-                         packet->data);
+                         int(packet->arg_size[0]),
+                         packet->arg[0]);
     }
     else
     {
@@ -277,12 +277,21 @@
     if (packet->command == GEARMAN_COMMAND_ECHO_RES)
     {
       gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM,
-                         "GEAR length: %" PRIu64 " gearmand_command_t: %s echo: %.*",
+                         "GEAR length: %" PRIu64 " gearmand_command_t: %s echo: %.*s",
                          uint64_t(packet->data_size),
                          gearman_strcommand(packet->command),
                          int(packet->data_size),
                          packet->data);
     }
+    else if (packet->command == GEARMAN_COMMAND_OPTION_RES)
+    {
+      gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM,
+                         "GEAR length: %" PRIu64 " gearmand_command_t: %s option: %.*s",
+                         uint64_t(packet->data_size),
+                         gearman_strcommand(packet->command),
+                         int(packet->arg_size[0]),
+                         packet->arg[0]);
+    }
     else
     {
       gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM,
 
=== modified file 'libgearman-server/server.cc'
--- libgearman-server/server.cc	2013-07-05 22:06:45 +0000
+++ libgearman-server/server.cc	2013-07-10 10:57:30 +0000
@@ -72,11 +72,13 @@
  * Queue an error packet.
  */
 static gearmand_error_t _server_error_packet(gearman_server_con_st *server_con,
-                                             gearman_return_t error_code, const char *error_string)
+                                             gearman_return_t client_return_code, const char *error_string)
 {
-  const char* error_code_string= gearman_strerror(error_code);
+  const char* error_code_string= gearman_strerror(client_return_code);
   error_code_string+= 8;
 
+  gearmand_log_error(GEARMAN_DEFAULT_LOG_PARAM, "%s:%s", gearman_strerror(client_return_code), error_string);
+
   return gearman_server_io_packet_add(server_con, false, GEARMAN_MAGIC_RESPONSE,
                                       GEARMAN_COMMAND_ERROR, error_code_string,
                                       (size_t)(strlen(error_code_string) + 1),
@@ -818,7 +820,7 @@
                          server_job->function->function_name_size, server_job->function->function_name, server_job->function->function_name_size);
       if (server_job == NULL)
       {
-        return _server_error_packet(server_con, GEARMAN_NO_JOBS, "Job given in work result not found");
+        return _server_error_packet(server_con, GEARMAN_NO_JOBS, "An exception was received for a job that does not exist");
       }
 
       /* Queue the exception packet for all clients. */
 
=== modified file 'libgearman/check.cc'
--- libgearman/check.cc	2013-07-08 09:58:12 +0000
+++ libgearman/check.cc	2013-07-10 10:57:30 +0000
@@ -93,19 +93,21 @@
     if (con->_packet.argc)
     {
       gearman_return_t maybe_server_error= string2return_code(static_cast<char *>(con->_packet.arg[0]), int(con->_packet.arg_size[0]));
-
       if (maybe_server_error == GEARMAN_MAX_RETURN)
       {
         maybe_server_error= GEARMAN_SERVER_ERROR;
       }
 
-      return gearman_universal_set_error(_universal, maybe_server_error, GEARMAN_AT, "%.*s:%.*s",
+      return gearman_universal_set_error(_universal, maybe_server_error, GEARMAN_AT, "%s:%s %.*s:%.*s",
+                                         con->host(), con->service(),
                                          con->_packet.arg_size[0], con->_packet.arg[0],
                                          con->_packet.arg_size[1], con->_packet.arg[1]
                                         );
     }
 
-    return gearman_error(_universal, GEARMAN_SERVER_ERROR, "server lacks support for client's to cancel a job");
+    return gearman_universal_set_error(_universal, GEARMAN_SERVER_ERROR, GEARMAN_AT, "%s:%s lacks support for client's to cancel a job",
+                                       con->host(), con->service()
+                                      );
   }
 
   return GEARMAN_SUCCESS;
@@ -118,20 +120,24 @@
     if (con->_packet.argc)
     {
       gearman_return_t maybe_server_error= string2return_code(static_cast<char *>(con->_packet.arg[0]), int(con->_packet.arg_size[0]));
-
       if (maybe_server_error == GEARMAN_MAX_RETURN)
       {
         maybe_server_error= GEARMAN_INVALID_SERVER_OPTION;
       }
 
-      return gearman_universal_set_error(_universal, maybe_server_error, GEARMAN_AT, "%d: %.*s:%.*s", con->_packet.argc,
-                                         con->_packet.arg_size[0], con->_packet.arg[0],
-                                         con->_packet.arg_size[1], con->_packet.arg[1]
+      return gearman_universal_set_error(_universal, maybe_server_error, GEARMAN_AT, "%s:%s Invalid option %.*s",
+                                         con->host(), con->service(),
+                                         con->_packet.arg_size[0], con->_packet.arg[0]
                                         );
     }
 
-    return gearman_error(_universal, GEARMAN_INVALID_SERVER_OPTION, "invalid server option");
+    return gearman_universal_set_error(_universal, GEARMAN_INVALID_SERVER_OPTION, GEARMAN_AT, "%s:%s Invalid option %.*s",
+                                       con->host(), con->service(),
+                                       con->_packet.arg_size[0], con->_packet.arg[0]
+                                      );
   }
 
+  // @todo mark option set for connection
+
   return GEARMAN_SUCCESS;
 }
 
=== modified file 'libgearman/check.h'
--- libgearman/check.h	2013-04-16 10:05:29 +0000
+++ libgearman/check.h	2013-07-10 10:57:30 +0000
@@ -59,15 +59,17 @@
 
 class OptionCheck : public Check {
 public:
-  OptionCheck(gearman_universal_st& universal_):
-    _universal(universal_)
-    {
-    }
+  OptionCheck(gearman_universal_st& universal_, gearman_string_t& option_):
+    _universal(universal_),
+    _option(option_)
+  {
+  }
 
   gearman_return_t success(gearman_connection_st* con);
 
 private:
-  gearman_universal_st& _universal;
+    gearman_universal_st& _universal;
+    gearman_string_t& _option;
 };
 
 class CancelCheck : public Check {
 
=== modified file 'libgearman/client.cc'
--- libgearman/client.cc	2013-07-08 11:33:16 +0000
+++ libgearman/client.cc	2013-07-10 10:57:30 +0000
@@ -1806,15 +1806,20 @@
 {
   if (client_shell and client_shell->impl())
   {
+    Client* client= client_shell->impl();
     gearman_string_t option= { option_arg, option_arg_size };
-    if (gearman_request_option(client_shell->impl()->universal, option))
+
+    if (gearman_success(gearman_server_option(client->universal, option)))
     {
-      if (strcmp("exceptions", option_arg) == 0)
+      if (gearman_request_option(client->universal, option))
       {
-        client_shell->impl()->options.exceptions= true;
+        if (strncmp("exceptions", option_arg, sizeof("exceptions")) == 0)
+        {
+          client->options.exceptions= true;
+        }
+
+        return true;
       }
-
-      return true;
     }
   }
 
 
=== modified file 'libgearman/connection.cc'
--- libgearman/connection.cc	2013-07-08 09:58:12 +0000
+++ libgearman/connection.cc	2013-07-10 10:57:30 +0000
@@ -49,6 +49,8 @@
 #include "libgearman/interface/push.hpp"
 #include "libgearman/log.hpp"
 
+#include "libgearman/protocol/option.h"
+
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
@@ -425,11 +427,8 @@
          head= head->next)
     {
       gearman_packet_st message;
-      const void *args[]= { (const void*)head->value() };
-      size_t args_size[]= { head->size() };
-      gearman_return_t ret= gearman_packet_create_args(universal, message, GEARMAN_MAGIC_REQUEST,
-                                                       GEARMAN_COMMAND_OPTION_REQ, args, args_size, 1);
-
+      gearman_string_t option= { (const char*)head->value(), head->size() };
+      gearman_return_t ret=  libgearman::protocol::option(universal, message, option);
       if (gearman_failed(ret))
       {
         assert(universal.error_code());
@@ -439,7 +438,7 @@
       }
 
       PUSH_BLOCKING(universal);
-      OptionCheck check(universal);
+      OptionCheck check(universal, option);
       ret= _send_packet(message, true);
       if (gearman_failed(ret))
       {
 
=== modified file 'libgearman/execute.cc'
--- libgearman/execute.cc	2013-07-07 00:13:00 +0000
+++ libgearman/execute.cc	2013-07-10 10:57:30 +0000
@@ -259,20 +259,18 @@
                            NULL);
   }
 
-  if (task == NULL)
+  if (task)
   {
-    return NULL;
+    do {
+      gearman_return_t rc;
+      if (gearman_failed(rc= gearman_client_run_tasks(client->shell())))
+      {
+        gearman_gerror(client->universal, rc);
+        gearman_task_free(task);
+        return NULL;
+      }
+    } while (gearman_continue(gearman_task_return(task)));
   }
 
-  do {
-    gearman_return_t rc;
-    if (gearman_failed(rc= gearman_client_run_tasks(client->shell())))
-    {
-      gearman_gerror(client->universal, rc);
-      gearman_task_free(task);
-      return NULL;
-    }
-  } while (gearman_continue(gearman_task_return(task)));
-
   return task;
 }
 
=== modified file 'libgearman/include.am'
--- libgearman/include.am	2013-07-09 08:48:15 +0000
+++ libgearman/include.am	2013-07-10 10:57:30 +0000
@@ -56,6 +56,7 @@
 		 libgearman/log.hpp \
 		 libgearman/packet.hpp \
 		 libgearman/protocol/echo.h \
+		 libgearman/protocol/option.h \
 		 libgearman/protocol/submit.h \
 		 libgearman/protocol/work_exception.h \
 		 libgearman/result.hpp \
@@ -116,6 +117,7 @@
 				  libgearman/packet.cc \
 				  libgearman/parse.cc \
 				  libgearman/protocol/echo.cc \
+				  libgearman/protocol/option.cc \
 				  libgearman/protocol/submit.cc \
 				  libgearman/protocol/work_exception.cc \
 				  libgearman/result.cc \
 
=== added file 'libgearman/protocol/option.cc'
--- libgearman/protocol/option.cc	1970-01-01 00:00:00 +0000
+++ libgearman/protocol/option.cc	2013-07-10 10:57:30 +0000
@@ -0,0 +1,80 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Gearmand client and server library.
+ *
+ *  Copyright (C) 2013 Data Differential, http://datadifferential.com/
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "gear_config.h"
+#include <libgearman/common.h>
+#include "libgearman/vector.h"
+
+#include <cstdio>
+#include <cstring>
+
+namespace libgearman {
+namespace protocol {
+
+  gearman_return_t option(gearman_universal_st& universal,
+                          gearman_packet_st& message,
+                          const gearman_string_t& option_)
+  {
+    if (gearman_c_str(option_) == NULL)
+    {
+      return gearman_error(universal, GEARMAN_INVALID_ARGUMENT, "option was NULL");
+    }
+
+    if (gearman_size(option_) == 0)
+    {
+      return gearman_error(universal, GEARMAN_INVALID_ARGUMENT, "option size was 0");
+    }
+
+    if (gearman_size(option_) > GEARMAN_MAX_OPTION_SIZE)
+    {
+      return gearman_error(universal, GEARMAN_ARGUMENT_TOO_LARGE, "option was greater then GEARMAN_MAX_OPTION_SIZE");
+    }
+
+    const void *args[1];
+    size_t args_size[1];
+
+    args[0]= gearman_c_str(option_);
+    args_size[0]= gearman_size(option_);
+
+    return gearman_packet_create_args(universal, message, GEARMAN_MAGIC_REQUEST,
+                                      GEARMAN_COMMAND_OPTION_REQ,
+                                      args, args_size, 1);
+  }
+
+} // namespace protocol
+} // namespace libgearman
+
 
=== added file 'libgearman/protocol/option.h'
--- libgearman/protocol/option.h	1970-01-01 00:00:00 +0000
+++ libgearman/protocol/option.h	2013-07-10 10:57:30 +0000
@@ -0,0 +1,50 @@
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Gearmand client and server library.
+ *
+ *  Copyright (C) 2013 Data Differential, http://datadifferential.com/
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#pragma once
+
+
+namespace libgearman {
+namespace protocol {
+
+  gearman_return_t option(gearman_universal_st&,
+                          gearman_packet_st&,
+                          const gearman_string_t&);
+
+} // namespace protocol
+} // namespace libgearman
+
 
=== modified file 'libgearman/universal.cc'
--- libgearman/universal.cc	2013-07-06 00:33:10 +0000
+++ libgearman/universal.cc	2013-07-10 10:57:30 +0000
@@ -54,6 +54,7 @@
 #include "libgearman/uuid.hpp"
 
 #include "libgearman/protocol/echo.h"
+#include "libgearman/protocol/option.h"
 
 #include "libgearman/ssl.h"
 
@@ -583,6 +584,32 @@
   return ret;
 }
 
+gearman_return_t gearman_server_option(gearman_universal_st& universal, gearman_string_t& option)
+{
+  if (universal.has_connections() == false)
+  {
+    return gearman_universal_set_error(universal, GEARMAN_NO_SERVERS, GEARMAN_AT, "no servers provided");
+  }
+
+  gearman_packet_st message;
+  gearman_return_t ret=  libgearman::protocol::option(universal, message, option);
+  if (gearman_success(ret))
+  {
+    PUSH_BLOCKING(universal);
+
+    OptionCheck check(universal, option);
+    ret= connection_loop(universal, message, check);
+  }
+  else
+  {
+    return universal.error_code();
+  }
+
+  gearman_packet_free(&message);
+
+  return ret;
+}
+
 
 gearman_return_t gearman_echo(gearman_universal_st& universal,
                               const void *workload_str,
 
=== modified file 'libgearman/universal.hpp'
--- libgearman/universal.hpp	2013-05-05 04:31:32 +0000
+++ libgearman/universal.hpp	2013-07-10 10:57:30 +0000
@@ -118,3 +118,5 @@
                                         size_t id_size);
 
 const char *gearman_univeral_namespace(gearman_universal_st& universal);
+
+gearman_return_t gearman_server_option(gearman_universal_st&, gearman_string_t&);
 
=== modified file 'libgearmancore/include.am'
--- libgearmancore/include.am	2013-06-27 22:57:50 +0000
+++ libgearmancore/include.am	2013-07-10 10:57:30 +0000
@@ -23,6 +23,7 @@
 libgearman_libgearmancore_la_SOURCES+= libgearman/log.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/packet.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/protocol/echo.cc
+libgearman_libgearmancore_la_SOURCES+= libgearman/protocol/option.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/protocol/submit.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/protocol/work_exception.cc
 libgearman_libgearmancore_la_SOURCES+= libgearman/server_options.cc
 
=== modified file 'libtest/timer.cc'
--- libtest/timer.cc	2013-01-10 12:05:49 +0000
+++ libtest/timer.cc	2013-07-10 10:57:30 +0000
@@ -41,7 +41,7 @@
 #include <ctime>
 #include <iomanip>
 
-#ifdef __MACH__
+#ifdef __APPLE__
 # include <mach/clock.h>
 # include <mach/mach.h>
 #else
@@ -110,7 +110,7 @@
 
 void Timer::_time(struct timespec& ts)
 {
-#ifdef __MACH__ // OSX lacks clock_gettime()
+#ifdef __APPLE__ // OSX lacks clock_gettime()
   clock_serv_t _clock_serv;
   mach_timespec_t _mach_timespec;
   host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &_clock_serv);
 
=== modified file 'tests/libgearman-1.0/gearman_execute_partition.cc'
--- tests/libgearman-1.0/gearman_execute_partition.cc	2013-07-06 09:37:11 +0000
+++ tests/libgearman-1.0/gearman_execute_partition.cc	2013-07-10 10:57:30 +0000
@@ -130,12 +130,12 @@
   ASSERT_TRUE(client);
 
   ASSERT_EQ(GEARMAN_SUCCESS,
-               gearman_client_echo(client, test_literal_param("this is mine")));
+            gearman_client_echo(client, test_literal_param("this is mine")));
 
   // This just hear to make it easier to trace when
   // gearman_execute_partition() is called (look in the log to see the
   // failed option setting.
-  gearman_client_set_server_option(client, test_literal_param("should fail"));
+  ASSERT_FALSE(gearman_client_set_server_option(client, test_literal_param("should fail")));
 
   // This is the real work
   gearman_argument_t workload= gearman_argument_make(0, 0, test_literal_param("this dog does not hunt"));
 
=== modified file 'tests/libgearman-1.0/include.am'
--- tests/libgearman-1.0/include.am	2013-07-03 03:54:06 +0000
+++ tests/libgearman-1.0/include.am	2013-07-10 10:57:30 +0000
@@ -106,7 +106,7 @@
 helgrind-worker: t/worker gearmand/gearmand
 	@$(HELGRIND_COMMAND) t/worker
 
-gdb-worker: t/libgearman-1.0/worker gearmand/gearmand
+gdb-worker: t/worker gearmand/gearmand
 	@$(GDB_COMMAND) t/worker
 
 ptrdiff-worker: t/worker gearmand/gearmand
 
=== modified file 'tests/libgearman-1.0/server_options.cc'
--- tests/libgearman-1.0/server_options.cc	2013-02-03 13:13:26 +0000
+++ tests/libgearman-1.0/server_options.cc	2013-07-10 10:57:30 +0000
@@ -52,7 +52,7 @@
 test_return_t gearman_client_set_server_option_exception(void *object)
 {
   gearman_client_st *client= (gearman_client_st *)object;
-  test_true(gearman_client_set_server_option(client, test_literal_param("exceptions")));
+  ASSERT_TRUE(gearman_client_set_server_option(client, test_literal_param("exceptions")));
   test_compare(GEARMAN_SUCCESS, gearman_client_echo(client, test_literal_param("echo")));
   return TEST_SUCCESS;
 }
@@ -60,7 +60,7 @@
 test_return_t gearman_client_set_server_option_bad(void *object)
 {
   gearman_client_st *client= (gearman_client_st *)object;
-  test_true(gearman_client_set_server_option(client, test_literal_param("bad")));
-  test_compare(GEARMAN_INVALID_SERVER_OPTION, gearman_client_echo(client, test_literal_param("echo")));
+  ASSERT_FALSE(gearman_client_set_server_option(client, test_literal_param("bad")));
+  test_compare(GEARMAN_SUCCESS, gearman_client_echo(client, test_literal_param("echo")));
   return TEST_SUCCESS;
 }
 
=== modified file 'tests/libgearman-1.0/worker_test.cc'
--- tests/libgearman-1.0/worker_test.cc	2013-07-06 20:11:54 +0000
+++ tests/libgearman-1.0/worker_test.cc	2013-07-10 10:57:30 +0000
@@ -945,6 +945,7 @@
 
   /* Now take job with one worker. */
   gearman_universal_st universal;
+  universal.timeout= 3000;
 
   gearman_connection_st *connection1;
   test_truth(connection1= gearman_connection_create(universal, NULL, default_port()));