[1892] Add scaffolding check around resource.h

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>
 

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>

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;
 

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;

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 {