tests/vntag: VNTAG decoder unittests

(cherry picked from commit 596d7608333290d22ea6cee26a79eb4f9ca8605d)

diff --git a/src/decode-vntag.c b/src/decode-vntag.c
index b5bf235d9d25f6deab62a1e7ffa9b0f1b728a819..b7963238bbba81a422514a098c9ff119e175eeb7 100644 (file)
--- a/src/decode-vntag.c
+++ b/src/decode-vntag.c
@@ -100,8 +100,8 @@ static int DecodeVNTagtest01(void)
 {
     uint8_t raw_vntag[] = { 0x00, 0x20, 0x08 };
     Packet *p = PacketGetFromAlloc();
-    if (unlikely(p == NULL))
-        return 0;
+    FAIL_IF_NULL(p);
+
     ThreadVars tv;
     DecodeThreadVars dtv;
 

diff --git a/src/decode.h b/src/decode.h
index 15196aa3ffe431c7a207258f3ca809aec16fcebc..136fbcb81ad34ab154a9dbd675fddbc8332cc4eb 100644 (file)
--- a/src/decode.h
+++ b/src/decode.h
@@ -93,6 +93,7 @@ enum PktSrcEnum {
 #include "decode-raw.h"
 #include "decode-null.h"
 #include "decode-vlan.h"
+#include "decode-vntag.h"
 #include "decode-vxlan.h"
 #include "decode-mpls.h"
 

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index 7f458808cfaa5ddfc7be013d6d074a145209c613..f996a90b2db69607e960db04f0f414ed22087675 100644 (file)
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -147,6 +147,7 @@ static void RegisterUnittests(void)
     DecodeCHDLCRegisterTests();
     DecodePPPRegisterTests();
     DecodeVLANRegisterTests();
+    DecodeVNTagRegisterTests();
     DecodeGeneveRegisterTests();
     DecodeVXLANRegisterTests();
     DecodeRawRegisterTests();