From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Wed, 29 Jul 2020 17:13:28 +0000 (+0000)
Subject: Merge pull request #2354 in SNORT/snort3 from ~MASHASAN/snort3:fix_ut_warning to... 
X-Git-Tag: 3.0.2-4~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=278cffd6427a842b4f6ca279fd882720fbd5f656;p=thirdparty%2Fsnort3.git

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

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 82399eff0..7b3fc109d 100644
--- 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>