From 1df33046551059f607e63093b8134d02d4601285 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 5 Dec 2011 08:28:46 +0100 Subject: [PATCH] Clean up for unittests code: only compile unittest api code when unittests are enabled. Fix unittest code that wasn't wrapped in the proper UNITTESTS ifdefs. --- src/counters.c | 6 ++++-- src/runmodes.c | 3 ++- src/util-bloomfilter-counting.c | 12 ++++++++---- src/util-hash.c | 4 ++++ src/util-unittest-helper.c | 6 +++++- src/util-unittest-helper.h | 3 +++ src/util-unittest.c | 6 +++++- src/util-unittest.h | 4 ++++ 8 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/counters.c b/src/counters.c index f42711490e..37b29cd3a8 100644 --- a/src/counters.c +++ b/src/counters.c @@ -1799,6 +1799,7 @@ void SCPerfReleasePCA(SCPerfCounterArray *pca) /*----------------------------------Unit_Tests--------------------------------*/ +#ifdef UNITTESTS static int SCPerfTestCounterReg01() { SCPerfContext pctx; @@ -2403,9 +2404,11 @@ static int SCPerfTestIntervalQual18() return result; } +#endif void SCPerfRegisterTests() { +#ifdef UNITTESTS UtRegisterTest("SCPerfTestCounterReg01", SCPerfTestCounterReg01, 0); UtRegisterTest("SCPerfTestCounterReg02", SCPerfTestCounterReg02, 0); UtRegisterTest("SCPerfTestCounterReg03", SCPerfTestCounterReg03, 1); @@ -2425,6 +2428,5 @@ void SCPerfRegisterTests() UtRegisterTest("SCPerfTestIntervalQual16", SCPerfTestIntervalQual16, 1); UtRegisterTest("SCPerfTestIntervalQual17", SCPerfTestIntervalQual17, 1); UtRegisterTest("SCPerfTestIntervalQual18", SCPerfTestIntervalQual18, 1); - - return; +#endif } diff --git a/src/runmodes.c b/src/runmodes.c index f13abfa64b..f1e14727c0 100644 --- a/src/runmodes.c +++ b/src/runmodes.c @@ -156,8 +156,9 @@ void RunModeRegisterRunModes(void) RunModeErfFileRegister(); RunModeErfDagRegister(); RunModeIdsAFPRegister(); +#ifdef UNITTESTS UtRunModeRegister(); - +#endif return; } diff --git a/src/util-bloomfilter-counting.c b/src/util-bloomfilter-counting.c index 1b6127d523..c6d58e055c 100644 --- a/src/util-bloomfilter-counting.c +++ b/src/util-bloomfilter-counting.c @@ -208,6 +208,11 @@ int BloomFilterCountingTest(BloomFilterCounting *bf, void *data, uint16_t datale return hit; } +/* + * ONLY TESTS BELOW THIS COMMENT + */ + +#ifdef UNITTESTS static uint32_t BloomHash(void *data, uint16_t datalen, uint8_t iter, uint32_t hash_size) { uint8_t *d = (uint8_t *)data; uint32_t i; @@ -224,10 +229,6 @@ static uint32_t BloomHash(void *data, uint16_t datalen, uint8_t iter, uint32_t h return hash; } -/* - * ONLY TESTS BELOW THIS COMMENT - */ - static int BloomFilterCountingTestInit01 (void) { BloomFilterCounting *bf = BloomFilterCountingInit(1024, 4, 4, BloomHash); if (bf == NULL) @@ -371,8 +372,10 @@ end: if (bf != NULL) BloomFilterCountingFree(bf); return result; } +#endif void BloomFilterCountingRegisterTests(void) { +#ifdef UNITTESTS UtRegisterTest("BloomFilterCountingTestInit01", BloomFilterCountingTestInit01, 1); UtRegisterTest("BloomFilterCountingTestInit02", BloomFilterCountingTestInit02, 1); UtRegisterTest("BloomFilterCountingTestInit03", BloomFilterCountingTestInit03, 1); @@ -385,5 +388,6 @@ void BloomFilterCountingRegisterTests(void) { UtRegisterTest("BloomFilterCountingTestFull01", BloomFilterCountingTestFull01, 1); UtRegisterTest("BloomFilterCountingTestFull02", BloomFilterCountingTestFull02, 1); +#endif } diff --git a/src/util-hash.c b/src/util-hash.c index 7fd2230002..b74415fa61 100644 --- a/src/util-hash.c +++ b/src/util-hash.c @@ -231,6 +231,7 @@ char HashTableDefaultCompare(void *data1, uint16_t len1, void *data2, uint16_t l * ONLY TESTS BELOW THIS COMMENT */ +#ifdef UNITTESTS static int HashTableTestInit01 (void) { HashTable *ht = HashTableInit(1024, HashTableGenericHash, NULL, NULL); if (ht == NULL) @@ -391,8 +392,10 @@ end: if (ht != NULL) HashTableFree(ht); return result; } +#endif void HashTableRegisterTests(void) { +#ifdef UNITTESTS UtRegisterTest("HashTableTestInit01", HashTableTestInit01, 1); UtRegisterTest("HashTableTestInit02", HashTableTestInit02, 1); UtRegisterTest("HashTableTestInit03", HashTableTestInit03, 1); @@ -405,5 +408,6 @@ void HashTableRegisterTests(void) { UtRegisterTest("HashTableTestFull01", HashTableTestFull01, 1); UtRegisterTest("HashTableTestFull02", HashTableTestFull02, 1); +#endif } diff --git a/src/util-unittest-helper.c b/src/util-unittest-helper.c index 54d1c10e3e..728912f4f9 100644 --- a/src/util-unittest-helper.c +++ b/src/util-unittest-helper.c @@ -41,6 +41,8 @@ #include "util-unittest.h" #include "util-unittest-helper.h" +#ifdef UNITTESTS + /** * \brief return the uint32_t for a ipv4 address string * @@ -832,8 +834,10 @@ uint32_t UTHBuildPacketOfFlows(uint32_t start, uint32_t end, uint8_t dir) { return i; } +/* + * unittests for the unittest helpers + */ -#ifdef UNITTESTS /** * \brief CheckUTHTestPacket wrapper to check packets for unittests */ diff --git a/src/util-unittest-helper.h b/src/util-unittest-helper.h index a53a7149d5..3e90beed96 100644 --- a/src/util-unittest-helper.h +++ b/src/util-unittest-helper.h @@ -24,6 +24,7 @@ #ifndef __UTIL_UNITTEST_HELPER__ #define __UTIL_UNITTEST_HELPER__ +#ifdef UNITTESTS uint32_t UTHSetIPv4Address(char *); Packet *UTHBuildPacketReal(uint8_t *, uint16_t, uint16_t, char *, char *, uint16_t, uint16_t); @@ -55,6 +56,8 @@ int UTHGenericTest(Packet **, int, char **, uint32_t *, uint32_t *, int); uint32_t UTHBuildPacketOfFlows(uint32_t, uint32_t, uint8_t); Packet *UTHBuildPacketIPV6Real(uint8_t *, uint16_t , uint16_t , char *, char *, uint16_t , uint16_t ); +#endif + void UTHRegisterTests(void); #endif /* __UTIL_UNITTEST_HELPER__ */ diff --git a/src/util-unittest.c b/src/util-unittest.c index d74af5160b..6db65861d7 100644 --- a/src/util-unittest.c +++ b/src/util-unittest.c @@ -31,6 +31,8 @@ #include "util-time.h" #include "conf.h" +#ifdef UNITTESTS + static pcre *parse_regex; static pcre_extra *parse_regex_study; @@ -258,7 +260,9 @@ void UtRunModeRegister(void) return; } -#ifdef UNITTESTS +/* + * unittests for the unittests code + */ /** \brief True test * diff --git a/src/util-unittest.h b/src/util-unittest.h index 4959c24ada..ebad947089 100644 --- a/src/util-unittest.h +++ b/src/util-unittest.h @@ -27,6 +27,8 @@ #ifndef __UTIL_UNITTEST_H__ #define __UTIL_UNITTEST_H__ +#ifdef UNITTESTS + typedef struct UtTest_ { char *name; @@ -46,5 +48,7 @@ int UtRunSelftest (char *regex_arg); void UtListTests(char *regex_arg); void UtRunModeRegister(void); +#endif + #endif /* __UTIL_UNITTEST_H__ */