Merge lp:~brianaker/gearmand/fork-tests into lp:gearmand

[Brian Aker]

Merge

[lp:~brianaker/gearmand/fork-tests]

784. By Tangent.Org Continuous Integration on 2013-06-26

Merge lp:~brianaker/gearmand/fix-ssl-valgrind Build: jenkins-Gearmand-663

785. By Tangent.Org Continuous Integration on 2013-06-27

Merge https://code.launchpad.net/~brianaker/gearmand/gearman_connection_create-cleanup Build: jenkins-Gearmand-664

786. By Tangent.Org Continuous Integration on 2013-06-27

Merge https://code.launchpad.net/~brianaker/gearmand/redis-fix/ Build: jenkins-Gearmand-666

787. By Tangent.Org Continuous Integration on 2013-06-27

Merge lp:~brianaker/gearmand/exception-testing Build: jenkins-Gearmand-672

788. By Tangent.Org Continuous Integration on 2013-06-27

Merge p:~brianaker/gearmand/remove-job-on-exception Build: jenkins-Gearmand-676

789. By Tangent.Org Continuous Integration on 2013-06-27

Merge lp:~brianaker/gearmand/protocol-check Build: jenkins-Gearmand-682

790. By Tangent.Org Continuous Integration on 2013-06-28

Merge lp:~brianaker/gearmand/waitpid Build: jenkins-Gearmand-684

791. By Tangent.Org Continuous Integration on 2013-06-28

Merge lp:~brianaker/gearmand/connection Build: jenkins-Gearmand-685

792. By Tangent.Org Continuous Integration on 2013-06-28

Merge lp:~brianaker/gearmand/connection Build: jenkins-Gearmand-686

793. By Brian Aker on 2013-06-28

Fork check.

794. By Brian Aker on 2013-06-28

Add diagnostics.

795. By Brian Aker on 2013-06-30

Fix for fork test.

=== modified file '.bzrignore'
--- .bzrignore	2013-06-27 21:23:13 +0000
+++ .bzrignore	2013-06-30 02:51:26 +0000
@@ -117,3 +117,6 @@
 examples/wc_worker
 tmp_chroot
 tests/protocol
+libgearman/command.hpp
+libgearman/error_code.hpp
+TAGS

=== modified file 'configure.ac'
--- configure.ac	2013-06-06 18:29:24 +0000
+++ configure.ac	2013-06-30 02:51:26 +0000
@@ -187,6 +187,7 @@
 AC_REPLACE_FNMATCH
 AC_CHECK_FUNCS([accept4])
 AC_CHECK_FUNCS([dup2])
+AC_CHECK_FUNCS([fork])
 AC_CHECK_FUNCS([gettimeofday])
 AC_CHECK_FUNCS([memchr])
 AC_CHECK_FUNCS([memmove])
@@ -223,7 +224,15 @@
 LT_LIB_M
 
 # Check for CyaSSL
-AX_CHECK_LIBRARY([CYASSL],[cyassl/ssl.h],[cyassl])
+AC_DEFUN([AX_ENABLE_SSL],
+         [AC_PREREQ([2.63])dnl
+         AC_ARG_ENABLE([SSL],
+                       [AS_HELP_STRING([--enable-ssl],
+                                       [Enable ssl support for Gearman --enable-debug (yes|no) @<:@default=no@:>@])],
+                                       [AX_CHECK_LIBRARY([CYASSL],[cyassl/ssl.h],[cyassl])],
+                                       [AC_MSG_WARN([ssl will not be enabled])])
+         ])
+AX_ENABLE_SSL
 #AC_SUBST([CYASSL])
 #AC_SUBST([CYASSL_LIB])
 AX_ENABLE_LIBMEMCACHED
@@ -288,6 +297,7 @@
 echo "   * Building with libpq        $ac_cv_libpq"
 echo "   * Building with tokyocabinet $ac_enable_libtokyocabinet"
 echo "   * Building with libmysql     $found_mysql"
+echo "   * SSL enabled:               $enable_SSL"
 echo "   * make -j:                   $enable_jobserver"
 echo "   * VCS checkout:              $ac_cv_vcs_checkout"
 echo ""

=== modified file 'libgearman-server/plugins/protocol/gear/protocol.cc'
--- libgearman-server/plugins/protocol/gear/protocol.cc	2013-06-05 21:59:31 +0000
+++ libgearman-server/plugins/protocol/gear/protocol.cc	2013-06-30 02:51:26 +0000
@@ -230,7 +230,7 @@
       }
     }
 
-    if (packet->command == GEARMAN_COMMAND_ECHO_RES)
+    if (packet->command == GEARMAN_COMMAND_ECHO_RES or packet->command == GEARMAN_COMMAND_ECHO_REQ)
     {
       gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM,
                          "GEAR length: %" PRIu64 " gearmand_command_t: %s echo: %.*s",

=== modified file 'libgearman/check.cc'
--- libgearman/check.cc	2013-05-05 07:29:30 +0000
+++ libgearman/check.cc	2013-06-30 02:51:26 +0000
@@ -41,6 +41,8 @@
 
 #include "libgearman/error_code.h"
 
+#include <algorithm>
+
 EchoCheck::EchoCheck(gearman_universal_st& universal_,
     const void *workload_, const size_t workload_size_) :
     _universal(universal_),
@@ -56,10 +58,29 @@
     return gearman_error(_universal, GEARMAN_INVALID_COMMAND, "Wrong command sent in response to ECHO request");
   }
 
-  if (con->_packet.data_size != _workload_size or
-      memcmp(_workload, con->_packet.data, _workload_size))
-  {
-    return gearman_error(_universal, GEARMAN_ECHO_DATA_CORRUPTION, "corruption during echo");
+  size_t compared= std::min(con->_packet.size(), _workload_size);
+
+  if (compared != _workload_size or compared != con->_packet.size())
+  {
+    // If the workload_size is smaller
+    if (memcmp(_workload, con->_packet.value(), compared) == 0)
+    {
+      return gearman_universal_set_error(_universal, GEARMAN_ECHO_DATA_CORRUPTION, GEARMAN_AT,
+                                         "Truncation occured, Expected %u, received %u",
+                                         uint32_t(_workload_size), uint32_t(con->_packet.data_size));
+    }
+
+    return gearman_universal_set_error(_universal, GEARMAN_ECHO_DATA_CORRUPTION, GEARMAN_AT,
+                                       "Expected data was not received, expected %u, received %u",
+                                       uint32_t(_workload_size), uint32_t(con->_packet.data_size));
+  }
+  assert(compared == _workload_size);
+
+  if (memcmp(_workload, con->_packet.value(), compared))
+  {
+    return gearman_universal_set_error(_universal, GEARMAN_ECHO_DATA_CORRUPTION, GEARMAN_AT,
+                                       "Data sent was not what was received %u == %u == %u",
+                                       uint32_t(_workload_size), uint32_t(con->_packet.data_size), uint32_t(compared));
   }
 
   return GEARMAN_SUCCESS;

=== modified file 'libgearman/connection.cc'
--- libgearman/connection.cc	2013-06-28 05:25:57 +0000
+++ libgearman/connection.cc	2013-06-30 02:51:26 +0000
@@ -433,8 +433,10 @@
 
       if (gearman_failed(ret))
       {
+        assert(universal.error_code());
+        assert(universal.error());
         gearman_packet_free(&message);
-        return gearman_error(universal, GEARMAN_MEMORY_ALLOCATION_FAILURE, "gearman_packet_create_args()");
+        return universal.error_code();
       }
 
       PUSH_BLOCKING(universal);
@@ -442,8 +444,10 @@
       ret= _send_packet(message, true);
       if (gearman_failed(ret))
       {
+        assert(universal.error_code());
+        assert(universal.error());
         gearman_packet_free(&message);
-        return gearman_error(universal, ret, "Failed to send server-options packet");
+        return universal.error_code();
       }
 
       options.packet_in_use= true;
@@ -718,7 +722,7 @@
         {
           type|= SOCK_NONBLOCK; 
         }
-
+        
         fd= socket(addrinfo_next->ai_family, type, addrinfo_next->ai_protocol);
       }
 
@@ -946,11 +950,12 @@
       return NULL;
     }
 
+    // This should not fail
     _recv_packet= gearman_packet_create(universal, packet_arg);
     assert(_recv_packet == &packet_arg);
     if (_recv_packet == NULL)
     {
-      ret= gearman_error(universal, GEARMAN_MEMORY_ALLOCATION_FAILURE, "gearman_packet_create()");
+      ret= gearman_error(universal, GEARMAN_MEMORY_ALLOCATION_FAILURE, "Programmer error, gearman_packet_create() failed which should not be possible");
       return NULL;
     }
 
@@ -974,6 +979,7 @@
         }
         else if (ret != GEARMAN_IO_WAIT)
         {
+          assert(universal.error_code());
           close_socket();
           return NULL;
         }
@@ -1025,8 +1031,8 @@
     while (recv_data_size)
     {
       (void)receive_data(static_cast<uint8_t *>(const_cast<void *>(packet_arg.data)) +
-                      recv_data_offset,
-                      packet_arg.data_size -recv_data_offset, ret);
+                         recv_data_offset,
+                         packet_arg.data_size -recv_data_offset, ret);
       if (gearman_failed(ret))
       {
         return NULL;

=== modified file 'libgearman/error.cc'
--- libgearman/error.cc	2013-05-12 21:37:25 +0000
+++ libgearman/error.cc	2013-06-30 02:51:26 +0000
@@ -48,6 +48,9 @@
 #include <cstdio>
 #include <cstring>
 
+#include <sys/types.h>
+#include <unistd.h>
+
 static void correct_from_errno(gearman_universal_st& universal)
 {
   if (universal.error_code() == GEARMAN_ERRNO)
@@ -93,9 +96,9 @@
                                              const char *position,
                                              const char *format, ...)
 {
-  if (rc == GEARMAN_SUCCESS)
+  if (rc == GEARMAN_SUCCESS or rc == GEARMAN_IO_WAIT)
   {
-    return GEARMAN_SUCCESS;
+    return universal._error.rc= rc;
   }
 
   va_list args;
@@ -115,7 +118,8 @@
     universal._error.last_error[GEARMAN_MAX_ERROR_SIZE -1]= 0;
   }
 
-  length= snprintf(universal._error.last_error, GEARMAN_MAX_ERROR_SIZE, "%s(%s) %s -> %s", function, gearman_strerror(universal._error.rc), last_error, position);
+  length= snprintf(universal._error.last_error, GEARMAN_MAX_ERROR_SIZE, "%s(%s) %s -> %s pid(%u)", 
+                   function, gearman_strerror(universal._error.rc), last_error, position, getpid());
   if (length > int(GEARMAN_MAX_ERROR_SIZE) or length < 0)
   {
     assert(length > int(GEARMAN_MAX_ERROR_SIZE));
@@ -139,19 +143,19 @@
 {
   if (rc == GEARMAN_SUCCESS or rc == GEARMAN_IO_WAIT)
   {
-    return rc;
+    return universal._error.rc= rc;
   }
 
   universal._error.rc= rc;
   correct_from_errno(universal);
 
-  int length= snprintf(universal._error.last_error, GEARMAN_MAX_ERROR_SIZE, "%s(%s) -> %s", func, gearman_strerror(rc), position);
+  int length= snprintf(universal._error.last_error, GEARMAN_MAX_ERROR_SIZE, "%s(%s) -> %s pid(%u)",
+                       func, gearman_strerror(rc), position, getpid());
   if (length > int(GEARMAN_MAX_ERROR_SIZE) or length < 0)
   {
     assert(length > int(GEARMAN_MAX_ERROR_SIZE));
     assert(length < 0);
     universal._error.last_error[GEARMAN_MAX_ERROR_SIZE -1]= 0;
-    return GEARMAN_ARGUMENT_TOO_LARGE;
   }
 
   gearman_log_error(universal,
@@ -200,11 +204,11 @@
   int length;
   if (message)
   {
-    length= snprintf(universal._error.last_error, GEARMAN_MAX_ERROR_SIZE, "%s(%s) %s -> %s", function, errmsg_ptr, message, position);
+    length= snprintf(universal._error.last_error, GEARMAN_MAX_ERROR_SIZE, "%s(%s) %s -> %s pid(%d)", function, errmsg_ptr, message, position, getpid());
   }
   else
   {
-    length= snprintf(universal._error.last_error, GEARMAN_MAX_ERROR_SIZE, "%s(%s) -> %s", function, errmsg_ptr, position);
+    length= snprintf(universal._error.last_error, GEARMAN_MAX_ERROR_SIZE, "%s(%s) -> %s pid(%d)", function, errmsg_ptr, position, getpid());
   }
 
   if (length > int(GEARMAN_MAX_ERROR_SIZE) or length < 0)

=== modified file 'libgearman/interface/packet.hpp'
--- libgearman/interface/packet.hpp	2013-06-27 04:56:49 +0000
+++ libgearman/interface/packet.hpp	2013-06-30 02:51:26 +0000
@@ -102,7 +102,12 @@
     return false;
   }
 
-  const char* value(size_t& length_)
+  size_t size() const
+  {
+    return data_size;
+  }
+
+  const char* value(size_t& length_) const
   {
     length_= data_size;
 
@@ -114,6 +119,16 @@
     return NULL;
   }
 
+  const char* value() const
+  {
+    if (data_size)
+    {
+      return (const char*)data;
+    }
+
+    return NULL;
+  }
+
   void reset()
   {
     if (args != args_buffer and args)

=== modified file 'libgearman/log.hpp'
--- libgearman/log.hpp	2013-05-12 20:30:19 +0000
+++ libgearman/log.hpp	2013-06-30 02:51:26 +0000
@@ -65,7 +65,7 @@
 /**
  * Log an info message, see gearman_log() for argument details.
  */
-void gearman_log_info(gearman_universal_st& gearman, const char *format, ...);
+void gearman_log_info(gearman_universal_st&, const char *format, ...);
 
 /**
  * Log a debug message, see gearman_log() for argument details.

=== modified file 'libgearman/packet.cc'
--- libgearman/packet.cc	2013-06-11 06:48:11 +0000
+++ libgearman/packet.cc	2013-06-30 02:51:26 +0000
@@ -383,8 +383,7 @@
   if (packet->command == GEARMAN_COMMAND_TEXT ||
       packet->command >= GEARMAN_COMMAND_MAX)
   {
-    gearman_error(*packet->universal, GEARMAN_INVALID_COMMAND, "invalid command value");
-    return GEARMAN_INVALID_COMMAND;
+    return gearman_error(*packet->universal, GEARMAN_INVALID_COMMAND, "invalid command value");
   }
 
   memcpy(&tmp, packet->args + 8, 4);

=== modified file 'libgearman/universal.cc'
--- libgearman/universal.cc	2013-06-14 22:43:33 +0000
+++ libgearman/universal.cc	2013-06-30 02:51:26 +0000
@@ -362,7 +362,7 @@
       gearman_return_t local_ret= gearman_kill(gearman_universal_id(universal), GEARMAN_INTERRUPT);
       if (gearman_failed(local_ret))
       {
-        return GEARMAN_SHUTDOWN;
+        return gearman_gerror(universal, GEARMAN_SHUTDOWN);
       }
 
       return GEARMAN_SHUTDOWN_GRACEFUL;
@@ -370,7 +370,7 @@
 
     if (read_length == 0)
     {
-      return GEARMAN_SHUTDOWN;
+      return gearman_gerror(universal, GEARMAN_SHUTDOWN);
     }
 
 #if 0
@@ -542,7 +542,10 @@
     gearman_packet_st *packet_ptr= con->receiving(con->_packet, ret, true);
     if (packet_ptr == NULL)
     {
-      assert(&con->_packet == universal.packet_list);
+      if (ret != GEARMAN_NOT_CONNECTED and ret != GEARMAN_LOST_CONNECTION)
+      {
+        assert(&con->_packet == universal.packet_list);
+      }
       con->options.packet_in_use= false;
       break;
     }

=== modified file 'libtest/main.cc'
--- libtest/main.cc	2013-06-05 21:59:31 +0000
+++ libtest/main.cc	2013-06-30 02:51:26 +0000
@@ -2,7 +2,7 @@
  *
  *  Data Differential YATL (i.e. libtest)  library
  *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are

=== modified file 'libtest/run.gdb'
--- libtest/run.gdb	2013-05-03 06:03:28 +0000
+++ libtest/run.gdb	2013-06-30 02:51:26 +0000
@@ -2,6 +2,7 @@
 set logging overwrite on
 set environment LIBTEST_IN_GDB=1
 #set ASAN_OPTIONS=abort_on_error=1
+set detach-on-fork on
 handle SIGVTALRM stop
 run
 thread apply all bt

=== modified file 'libtest/stream.h'
--- libtest/stream.h	2013-06-02 05:10:20 +0000
+++ libtest/stream.h	2013-06-30 02:51:26 +0000
@@ -42,6 +42,9 @@
 #include <ctime>
 #include <ostream>
 
+#include <sys/types.h>
+#include <unistd.h>
+
 namespace libtest {
 namespace stream {
 
@@ -65,7 +68,8 @@
           << ":" 
           << line_number 
           << ": in " 
-          << func << "() "
+          << func << "() pid("
+          << getpid() << ") "
           << s.str()
           << std::endl;
       }
@@ -97,7 +101,8 @@
           << ":" 
           << line_number 
           << ": in " 
-          << func << "() "
+          << func << "() pid("
+          << getpid() << ") "
           << s.str()
           << std::endl;
       }

=== modified file 'tests/libgearman-1.0/client_test.cc'
--- tests/libgearman-1.0/client_test.cc	2013-06-05 21:59:31 +0000
+++ tests/libgearman-1.0/client_test.cc	2013-06-30 02:51:26 +0000
@@ -75,6 +75,7 @@
 #include "tests/execute.h"
 #include "tests/gearman_client_do_job_handle.h"
 #include "tests/gearman_execute_partition.h"
+#include "tests/libgearman-1.0/fork.h"
 #include "tests/protocol.h"
 #include "tests/regression.h"
 #include "tests/task.h"
@@ -2139,6 +2140,11 @@
   return TEST_SUCCESS;
 }
 
+test_st client_fork_TESTS[] ={
+  {"fork()", 0, check_client_fork_TEST },
+  {0, 0, 0}
+};
+
 test_st gearman_client_add_server_TESTS[] ={
   {"gearman_client_add_server(localhost)", 0, gearman_client_add_server_localhost_TEST },
   {"gearman_client_add_server(empty quote)", 0, gearman_client_add_server_empty_quote_TEST },
@@ -2496,6 +2502,7 @@
   {"gearman_execute_partition(GEARMAN_CLIENT_FREE_TASKS)", partition_free_SETUP, 0, gearman_execute_partition_tests},
   {"gearman_command_t", 0, 0, gearman_command_t_tests},
   {"coalescence", 0, 0, coalescence_TESTS},
+  {"fork", fork_SETUP, 0, client_fork_TESTS },
   {"loop", 0, 0, loop_TESTS},
   {"limits", 0, 0, limit_tests },
   {"client-logging", pre_logging, 0, tests_log_TESTS },

=== added file 'tests/libgearman-1.0/fork.cc'
--- tests/libgearman-1.0/fork.cc	1970-01-01 00:00:00 +0000
+++ tests/libgearman-1.0/fork.cc	2013-06-30 02:51:26 +0000
@@ -0,0 +1,118 @@
+/*  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 <libtest/test.hpp>
+
+#include "libgearman/client.hpp"
+
+using namespace org::gearmand;
+using namespace libtest;
+
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <iostream>
+#include <vector>
+
+test_return_t fork_SETUP(void*)
+{
+  return TEST_SUCCESS;
+}
+
+test_return_t check_client_fork_TEST(void*)
+{
+  test_skip_valgrind();
+
+  libgearman::Client client(libtest::default_port());
+
+#ifdef HAVE_FORK
+  {
+    ASSERT_EQ(GEARMAN_SUCCESS, gearman_client_echo(&client, test_literal_param("begin all forked")));
+    pid_t child= fork();
+
+    switch (child)
+    {
+      case -1:
+        FAIL("fork() failed with %s", strerror(errno));
+
+      case 0:
+        {
+          gearman_return_t ret;
+          if (gearman_failed(ret= gearman_client_echo(&client, test_literal_param("child forked"))))
+          {
+            Error << gearman_client_error(&client);
+            exit(int(ret));
+          }
+          exit(0);
+        }
+
+      default:
+        {
+          int exit_code= EXIT_FAILURE;
+          int status;
+          if (waitpid(child, &status, 0) == -1)
+          {
+            FAIL("waitpid() failed with %s", strerror(errno));
+          }
+          else
+          {
+            if (WIFEXITED(status))
+            {
+              exit_code= WEXITSTATUS(status);
+            }
+
+            if (WIFSIGNALED(status))
+            {
+              FAIL("child was killed by signal %s", strsignal(WTERMSIG(status)));
+            }
+            ASSERT_EQ(EXIT_SUCCESS, exit_code);
+          }
+
+          ASSERT_EQ(GEARMAN_LOST_CONNECTION, gearman_client_echo(&client, test_literal_param("parent forked")));
+        }
+    }
+    return TEST_SUCCESS;
+  }
+#else
+
+  return TEST_SKIPPED;
+#endif // HAVE_FORK
+}

=== added file 'tests/libgearman-1.0/fork.h'
--- tests/libgearman-1.0/fork.h	1970-01-01 00:00:00 +0000
+++ tests/libgearman-1.0/fork.h	2013-06-30 02:51:26 +0000
@@ -0,0 +1,42 @@
+/*  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
+
+test_return_t fork_SETUP(void*);
+
+test_return_t check_client_fork_TEST(void*);

=== modified file 'tests/libgearman-1.0/include.am'
--- tests/libgearman-1.0/include.am	2013-05-16 17:11:24 +0000
+++ tests/libgearman-1.0/include.am	2013-06-30 02:51:26 +0000
@@ -1,6 +1,7 @@
 # vim:ft=automake
 
 noinst_HEADERS+= tests/libgearman-1.0/client_test.h
+noinst_HEADERS+= tests/libgearman-1.0/fork.h
 noinst_HEADERS+= tests/libgearman-1.0/gearman_client_job_status_by_unique.h
 noinst_HEADERS+= tests/libgearman-1.0/multi_client_test.h
 
@@ -19,6 +20,7 @@
 tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/do.cc 
 tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/do_background.cc 
 tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/execute.cc 
+tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/fork.cc
 tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/gearman_client_do_job_handle.cc 
 tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/gearman_client_job_status_by_unique.cc
 tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/gearman_execute_partition.cc