Push workers off into start_worker.

tests/httpd.am

@@ -15,8 +15,6 @@ tests_httpd_test_DEPENDENCIES=
 tests_httpd_test_LDADD=
 
 tests_httpd_test_SOURCES+= tests/httpd_test.cc
-tests_httpd_test_SOURCES+= tests/workers/v2/echo_or_react.cc
-tests_httpd_test_SOURCES+= tests/workers/v2/echo_or_react_chunk.cc
 
 tests_httpd_test_DEPENDENCIES+= $(CLIENT_LDADD)
 

tests/include.am

@@ -27,22 +27,6 @@ noinst_HEADERS+= tests/task.h
 noinst_HEADERS+= tests/unique.h
 noinst_HEADERS+= tests/worker.h
 
-noinst_LTLIBRARIES+= tests/libstartworker.la
-tests_libstartworker_la_CXXFLAGS=
-tests_libstartworker_la_LIBADD=
-tests_libstartworker_la_SOURCES=
-
-tests_libstartworker_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
-tests_libstartworker_la_CXXFLAGS+= $(BOOST_CPPFLAGS)
-tests_libstartworker_la_LIBADD+= $(BOOST_THREAD_LDFLAGS)
-tests_libstartworker_la_LIBADD+= $(BOOST_THREAD_LIBS)
-tests_libstartworker_la_LIBADD+= libtest/libtest.la
-tests_libstartworker_la_LIBADD+= libgearman/libgearman.la
-tests_libstartworker_la_SOURCES+= tests/start_worker.cc
-tests_libstartworker_la_SOURCES+= tests/workers/v2/called.cc
-tests_libstartworker_la_SOURCES+= util/instance.cc
-tests_libstartworker_la_SOURCES+= util/operation.cc
-
 CLIENT_LDADD=
 CLIENT_LDADD+= libgearman/libgearman.la
 CLIENT_LDADD+= libtest/libtest.la
@@ -71,8 +55,6 @@ tests_cli_SOURCES=
 tests_cli_LDADD=
 
 tests_cli_SOURCES+= tests/cli.cc
-tests_cli_SOURCES+= tests/workers/v2/count.cc
-tests_cli_SOURCES+= tests/workers/v2/echo_or_react.cc
 tests_cli_DEPENDENCIES+= ${CLIENT_LDADD}
 tests_cli_DEPENDENCIES+= bin/gearman
 tests_cli_DEPENDENCIES+= bin/gearadmin

tests/start_worker.h

@@ -44,6 +44,7 @@
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 
+#include "tests/workers/v2/called.h"
 
 struct worker_handle_st
 {

tests/stress.am

@@ -25,7 +25,6 @@ endif
 
 tests_stress_test_SOURCES+= tests/burnin.cc
 tests_stress_test_SOURCES+= tests/stress_worker.cc
-tests_stress_test_SOURCES+= tests/workers/v2/echo_or_react.cc
 tests_stress_test_DEPENDENCIES+= ${CLIENT_LDADD}
 tests_stress_test_LDADD+= ${CLIENT_LDADD}
 check_PROGRAMS+=tests/stress_test

tests/workers/aggregator/cat.h

@@ -37,6 +37,5 @@
 
 #pragma once
 
+LIBTEST_API
 gearman_return_t cat_aggregator_fn(gearman_aggregator_st *aggregator, gearman_task_st *task, gearman_result_st *result);
-
-

tests/workers/include.am

@@ -21,3 +21,33 @@ noinst_HEADERS+= tests/workers/v2/increment_reset.h
 noinst_HEADERS+= tests/workers/v2/sleep_return_random.h
 noinst_HEADERS+= tests/workers/v2/split.h
 noinst_HEADERS+= tests/workers/v2/unique.h
+
+noinst_LTLIBRARIES+= tests/libstartworker.la
+tests_libstartworker_la_CXXFLAGS=
+tests_libstartworker_la_LIBADD=
+tests_libstartworker_la_SOURCES=
+
+tests_libstartworker_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
+tests_libstartworker_la_CXXFLAGS+= $(BOOST_CPPFLAGS)
+tests_libstartworker_la_LIBADD+= $(BOOST_THREAD_LDFLAGS)
+tests_libstartworker_la_LIBADD+= $(BOOST_THREAD_LIBS)
+tests_libstartworker_la_LIBADD+= libtest/libtest.la
+tests_libstartworker_la_LIBADD+= libgearman/libgearman.la
+tests_libstartworker_la_SOURCES+= tests/start_worker.cc
+tests_libstartworker_la_SOURCES+= util/instance.cc
+tests_libstartworker_la_SOURCES+= util/operation.cc
+tests_libstartworker_la_SOURCES+= tests/workers/aggregator/cat.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v1/echo_or_react.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v1/echo_or_react_chunk.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v1/echo_or_react_chunk_worker.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v1/increment_reset_worker.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v1/unique.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/called.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/count.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/echo_or_react.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/echo_or_react_chunk.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/increment_reset.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/sleep_return_random.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/split.cc
+tests_libstartworker_la_SOURCES+= tests/workers/v2/unique.cc
+

tests/workers/v1/echo_or_react.h

@@ -37,6 +37,7 @@
 
 #pragma once
 
+LIBTEST_API
 void *echo_or_react_worker(gearman_job_st *job, void *,
                            size_t *result_size, gearman_return_t *ret_ptr);
 

tests/workers/v1/echo_or_react_chunk.h

@@ -37,6 +37,7 @@
 
 #pragma once
 
+LIBTEST_API
 void *echo_or_react_chunk_worker(gearman_job_st *job, void *,
                                  size_t *result_size, gearman_return_t *ret_ptr);
 

tests/workers/v1/echo_or_react_chunk_worker.cc

@@ -36,10 +36,11 @@
  */
 
 #include <config.h>
+#include <libtest/test.hpp>
 
 #include <libgearman-1.0/gearman.h>
 
-#include "tests/workers/v1/echo_or_react_chunk_worker.h"
+#include "tests/workers/v1/echo_or_react_chunk.h"
 
 
 void *echo_or_react_chunk_worker(gearman_job_st *job, void *,

tests/workers/v1/increment_reset.h

@@ -37,4 +37,5 @@
 
 #pragma once
 
+LIBTEST_API
 void *increment_reset_worker(gearman_job_st *job, void *, size_t *result_size, gearman_return_t *ret_ptr);