Skip to content

Commit e6bdade

Browse files
committed
tests: Prints test number on segfault
1 parent 9b40a04 commit e6bdade

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
v3.x.y - YYYY-MMM-DD (to be released)
22
-------------------------------------
33

4+
- Regression: Mark the test as failed in case of segfault.
5+
[@zimmerle]
46
- Regex key selection should not be case-sensitive
57
[Issue #2296, #2107, #2297 - @michaelgranzow-avi, @victorhora,
68
@airween, @martinhsv, @zimmerle]

test/regression/regression.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
211211
*/
212212
if (test->m_automake_output) {
213213
std::cout << ":test-result: FAIL " << filename \
214-
<< ":" << t->name << std::endl;
214+
<< ":" << t->name << ":" << *count << std::endl;
215215
} else {
216216
std::cout << KRED << "failed!" << RESET << std::endl;
217217
}
@@ -254,7 +254,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
254254
/* Parser error was expected, but with a different content */
255255
if (test->m_automake_output) {
256256
std::cout << ":test-result: FAIL " << filename \
257-
<< ":" << t->name << std::endl;
257+
<< ":" << t->name << ":" << *count << std::endl;
258258
} else {
259259
std::cout << KRED << "failed!" << RESET << std::endl;
260260
}
@@ -280,7 +280,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
280280
if (t->parser_error.empty() == false) {
281281
if (test->m_automake_output) {
282282
std::cout << ":test-result: FAIL " << filename \
283-
<< ":" << t->name << std::endl;
283+
<< ":" << t->name << ":" << *count << std::endl;
284284
} else {
285285
std::cout << KRED << "failed!" << RESET << std::endl;
286286
std::cout << KWHT << "Expected a parser error." \
@@ -387,7 +387,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
387387
if (!d->contains(t->debug_log)) {
388388
if (test->m_automake_output) {
389389
std::cout << ":test-result: FAIL " << filename \
390-
<< ":" << t->name << std::endl;
390+
<< ":" << t->name << ":" << *count << std::endl;
391391
} else {
392392
std::cout << KRED << "failed!" << RESET << std::endl;
393393
}
@@ -399,7 +399,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
399399
} else if (r.status != t->http_code) {
400400
if (test->m_automake_output) {
401401
std::cout << ":test-result: FAIL " << filename \
402-
<< ":" << t->name << std::endl;
402+
<< ":" << t->name << ":" << *count << std::endl;
403403
} else {
404404
std::cout << KRED << "failed!" << RESET << std::endl;
405405
}
@@ -423,7 +423,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
423423
&& !contains(getAuditLogContent(modsec_transaction->m_rules->m_auditLog->m_path1), t->audit_log)) {
424424
if (test->m_automake_output) {
425425
std::cout << ":test-result: FAIL " << filename \
426-
<< ":" << t->name << std::endl;
426+
<< ":" << t->name << ":" << *count << std::endl;
427427
} else {
428428
std::cout << KRED << "failed!" << RESET << std::endl;
429429
}

test/test-suite.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ else
3030
RET=$?
3131
if [ $RET -eq 127 ]
3232
then
33-
echo ":test-result: SKIP: json is not enabled. (unit/$RET) ../$FILE"
33+
echo ":test-result: SKIP: json is not enabled. (unit/$RET) ../$FILE:$i"
3434
elif [ $RET -ne 0 ]
3535
then
36-
echo ":test-result: FAIL possible segfault: (unit/$RET) ../$FILE"
36+
echo ":test-result: FAIL possible segfault: (unit/$RET) ../$FILE:$i"
3737
fi
3838
fi
3939

0 commit comments

Comments
 (0)