[1892] Add scaffolding check around resource.h

diff --git a/src/lib/log/tests/log_formatter_unittest.cc b/src/lib/log/tests/log_formatter_unittest.cc
index d11e64a8503d989e58e1fe8c2cb0462072238af9..4f463c8b7275f012d583073dd4209a2adc30c1d1 100644 (file)
--- a/src/lib/log/tests/log_formatter_unittest.cc
+++ b/src/lib/log/tests/log_formatter_unittest.cc
@@ -14,9 +14,11 @@
 
 #include "config.h"
 #include <gtest/gtest.h>
+
 #ifdef EXPECT_ABORT
 #include <testutils/resource.h>
 #endif /* EXPECT_ABORT */
+
 #include <log/log_formatter.h>
 #include <log/logger_level.h>
 

diff --git a/src/lib/log/tests/logger_unittest.cc b/src/lib/log/tests/logger_unittest.cc
index 3be706abcdfb3066e9797b765dc39e02d73e6e16..5dddf32d34b1d510ce3ad5bd1f9e283e6965b765 100644 (file)
--- a/src/lib/log/tests/logger_unittest.cc
+++ b/src/lib/log/tests/logger_unittest.cc
@@ -17,7 +17,9 @@
 
 #include <gtest/gtest.h>
 
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
+#endif /* EXPECT_DEATH */
 
 #include <log/logger.h>
 #include <log/logger_manager.h>

diff --git a/src/lib/log/tests/message_initializer_2_unittest.cc b/src/lib/log/tests/message_initializer_2_unittest.cc
index 8a338f4daa5d609ffa5137fad4de5598b902620e..e848a6c4b270987fb9db763503ad7ec432af8d55 100644 (file)
--- a/src/lib/log/tests/message_initializer_2_unittest.cc
+++ b/src/lib/log/tests/message_initializer_2_unittest.cc
@@ -14,7 +14,10 @@
 
 #include <log/message_initializer.h>
 #include <gtest/gtest.h>
+
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
+#endif /* EXPECT_DEATH */
 
 using namespace isc::log;
 

diff --git a/src/lib/server_common/tests/portconfig_unittest.cc b/src/lib/server_common/tests/portconfig_unittest.cc
index 3910e6b2a3a2e573b90ae89924abf03579e9f733..ad8d1e9d4c547c7279eb957638eb7f71ef9ff914 100644 (file)
--- a/src/lib/server_common/tests/portconfig_unittest.cc
+++ b/src/lib/server_common/tests/portconfig_unittest.cc
@@ -12,17 +12,21 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <gtest/gtest.h>
+
 #include <server_common/portconfig.h>
 #include <testutils/socket_request.h>
 #include <testutils/mockups.h>
+
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
+#endif /* EXPECT_DEATH */
 
 #include <cc/data.h>
 #include <exceptions/exceptions.h>
 #include <asiolink/asiolink.h>
 #include <asiodns/asiodns.h>
 
-#include <gtest/gtest.h>
 #include <string>
 
 using namespace isc::server_common::portconfig;

diff --git a/src/lib/util/tests/buffer_unittest.cc b/src/lib/util/tests/buffer_unittest.cc
index 7caa58601f47b2dea02f19f03ae9589190bb40c8..ae164ff524a0a00bd56facc4d495ae3933bb52b0 100644 (file)
--- a/src/lib/util/tests/buffer_unittest.cc
+++ b/src/lib/util/tests/buffer_unittest.cc
@@ -12,13 +12,16 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <gtest/gtest.h>
+
 #include <exceptions/exceptions.h>
+
+#ifdef EXPECT_DEATH
 #include <testutils/resource.h>
+#endif /* EXPECT_DEATH */
 
 #include <util/buffer.h>
 
-#include <gtest/gtest.h>
-
 using namespace isc;
 
 namespace {