Merge pull request #2354 in SNORT/snort3 from ~MASHASAN/snort3:fix_ut_warning to...

Squashed commit of the following:

commit 582e004954e2ac17d048e8f2d586d76987bc2161
Author: Masud Hasan <mashasan@cisco.com>
Date:   Tue Jul 28 18:12:01 2020 -0400

    rna: Fix redefined macro warnings in between unit-test tools

diff --git a/src/network_inspectors/rna/test/rna_module_test.cc b/src/network_inspectors/rna/test/rna_module_test.cc
index 82399eff0cccd0de5b8973eb69cf1beed3d07abc..7b3fc109dab1e3e8d0ec353d07ccc506008b2be4 100644 (file)
--- a/src/network_inspectors/rna/test/rna_module_test.cc
+++ b/src/network_inspectors/rna/test/rna_module_test.cc
@@ -26,6 +26,12 @@
 
 #include "rna_module_mock.h"
 
+// To avoid warnings between catch.hpp and UtestMacros.h macro definitions,
+// since rna_module.cc has both catch and cpputest tests
+#undef CHECK
+#undef CHECK_FALSE
+#undef CHECK_THROWS
+
 #include <CppUTest/CommandLineTestRunner.h>
 #include <CppUTest/TestHarness.h>