BIND 10 trac931_2, updated. 990a0cff9891fce08b3e163720dfa08fffdede5f [trac931] Disable warning on one needed file

[BIND 10 source code commits]

The branch, trac931_2 has been updated
       via  990a0cff9891fce08b3e163720dfa08fffdede5f (commit)
       via  54f86d7796c55289518befaefdcdd7d84ebefa88 (commit)
      from  f39c8aea4a0f9dc4b910c003b336e124149ab88b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 990a0cff9891fce08b3e163720dfa08fffdede5f
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Mon May 23 11:34:51 2011 +0200

    [trac931] Disable warning on one needed file

commit 54f86d7796c55289518befaefdcdd7d84ebefa88
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Mon May 23 11:21:54 2011 +0200

    [trac931] Missing includes

-----------------------------------------------------------------------

Summary of changes:
 src/lib/config/tests/Makefile.am            |    9 ++++++++-
 src/lib/config/tests/ccsession_unittests.cc |    7 +++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am
index 0d2c29b..52e3ae7 100644
--- a/src/lib/config/tests/Makefile.am
+++ b/src/lib/config/tests/Makefile.am
@@ -16,8 +16,14 @@ libfake_session_la_SOURCES = fake_session.h fake_session.cc
 
 TESTS =
 if HAVE_GTEST
+# We build this file with disabled warnings because of asio
+lib_LTLIBRARIES += libasiobased.la
+libasiobased_la_SOURCES = ccsession_unittests.cc
+libasiobased_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) -Wno-unused-parameter
+libasiobased_la_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+
 TESTS += run_unittests
-run_unittests_SOURCES = ccsession_unittests.cc module_spec_unittests.cc config_data_unittests.cc run_unittests.cc
+run_unittests_SOURCES = module_spec_unittests.cc config_data_unittests.cc run_unittests.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
@@ -26,6 +32,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
 run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
 run_unittests_LDADD += libfake_session.la
+run_unittests_LDADD += libasiobased.la
 run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
 
 endif
diff --git a/src/lib/config/tests/ccsession_unittests.cc b/src/lib/config/tests/ccsession_unittests.cc
index ee6d8e7..44c9bfa 100644
--- a/src/lib/config/tests/ccsession_unittests.cc
+++ b/src/lib/config/tests/ccsession_unittests.cc
@@ -15,6 +15,13 @@
 #include <asio.hpp>
 #include <boost/bind.hpp>
 
+// These 3 are for delayedStart test. For windows and such, probably disabling
+// that test would be best option, it is not that important and while the test
+// itself uses unix-specific features, it tests OS-agnostic part of code.
+#include <unistd.h> // For fork in one of the tests
+#include <sys/types.h> // And for kill
+#include <signal.h>
+
 #include <config.h>
 
 #include <gtest/gtest.h>