fix unittests. fix replace unittests that allow alproto keywords with replace

remotes/origin/master-1.1.x
Anoop Saldanha 14 years ago committed by Victor Julien
parent a0eec3d846
commit 0acfcc206c

@ -599,7 +599,7 @@ int DetectReplaceParseTest02(void)
de_ctx->sig_list = SigInit(de_ctx,
"alert http any any -> any any "
"(msg:\"test\"; content:\"doh\"; replace:\"bon\"; sid:238012;)");
if (de_ctx->sig_list != NULL) {
if (de_ctx->sig_list == NULL) {
result = 0;
goto end;
}
@ -786,11 +786,11 @@ void DetectReplaceRegisterTests(void)
UtRegisterTest("DetectReplaceMatchTest15", DetectReplaceMatchTest15, 1);
/* parsing */
UtRegisterTest("DetectReplaceParseTest01", DetectReplaceParseTest01, 1);
UtRegisterTest("DetectReplaceParseTest02", DetectReplaceParseTest02, 0);
UtRegisterTest("DetectReplaceParseTest03", DetectReplaceParseTest03, 0);
UtRegisterTest("DetectReplaceParseTest02", DetectReplaceParseTest02, 1);
UtRegisterTest("DetectReplaceParseTest03", DetectReplaceParseTest03, 1);
UtRegisterTest("DetectReplaceParseTest04", DetectReplaceParseTest04, 1);
UtRegisterTest("DetectReplaceParseTest05", DetectReplaceParseTest05, 1);
UtRegisterTest("DetectReplaceParseTest06", DetectReplaceParseTest06, 1);
UtRegisterTest("DetectReplaceParseTest07", DetectReplaceParseTest07, 0);
UtRegisterTest("DetectReplaceParseTest07", DetectReplaceParseTest07, 1);
#endif /* UNITTESTS */
}

@ -9296,12 +9296,17 @@ static int SigTestSgh05 (void) {
goto end;
}
if (sgh->mpm_ctx == NULL) {
printf("sgh->mpm_type == NULL: ");
if (sgh->mpm_ctx != NULL) {
printf("sgh->mpm_ctx != NULL: ");
goto end;
}
if (sgh->mpm_ctx->mpm_type != MPM_WUMANBER) {
if (sgh->mpm_stream_ctx == NULL) {
printf("sgh->mpm_stream_ctx == NULL: ");
goto end;
}
if (sgh->mpm_stream_ctx->mpm_type != MPM_WUMANBER) {
printf("sgh->mpm_type != MPM_WUMANBER, expected %d, got %d: ", MPM_WUMANBER, sgh->mpm_ctx->mpm_type);
goto end;
}

Loading…
Cancel
Save