mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-13 13:26:01 +03:00
e6e2989bd5
- Added new test/test_suite.in with list of regression and unit tests
previously in Makefile.am, to be shared between Unix and Windows
builds.
- Updated regression.cc & unit.cc to return the number of failed tests
to indicate to CTest that the test failed. Similarly, a crash or
unhandled exception terminates the process with a non-zero exit code.
- This change doesn't affect running the tests with autotest in Unix
builds because this processes test output from custom-test-driver &
test-suite.sh, and ignores the exit code of the test runner.
- Removed comment in test/test-cases/regression-offset-variable.json as
this is not supported by JSON and prevents strict parsers to read and
process the file.
- Minor change in regression.cc's clearAuditLog to replace std::ifstream
with std::ofstream as the mode to open the flag applies to an output
stream.
- Minor change in unit.cc to simplify code that deletes tests.
- Minor changes to test/custom-test-driver to correct usage information.
101 lines
2.3 KiB
Makefile
101 lines
2.3 KiB
Makefile
|
|
if TEST_UTILITIES
|
|
export MAYBE_TEST = test
|
|
endif
|
|
|
|
if EXAMPLES
|
|
export MAYBE_EXAMPLES = examples
|
|
endif
|
|
|
|
|
|
SUBDIRS = \
|
|
others \
|
|
src \
|
|
doc \
|
|
tools \
|
|
$(MAYBE_EXAMPLES) \
|
|
$(MAYBE_TEST)
|
|
|
|
|
|
|
|
# make clean
|
|
CLEANFILES =
|
|
|
|
ACLOCAL_AMFLAGS = -I build
|
|
|
|
# make maintainer-clean
|
|
MAINTAINERCLEANFILES = \
|
|
aclocal.m4 \
|
|
ar-lib \
|
|
build/libtool.m4 \
|
|
build/lt~obsolete.m4 \
|
|
build/ltoptions.m4 \
|
|
build/ltsugar.m4 \
|
|
build/ltversion.m4 \
|
|
coding-style.txt \
|
|
compile \
|
|
config.guess \
|
|
config.sub \
|
|
configure \
|
|
cppcheck.txt \
|
|
depcomp \
|
|
install-sh \
|
|
ltmain.sh \
|
|
Makefile.in \
|
|
missing \
|
|
test/modsec-shared-collections \
|
|
test/modsec-shared-collections-lock \
|
|
test-suite-drd.log \
|
|
test-suite-helgrind.log \
|
|
test-suite-memcheck.log \
|
|
ylwrap
|
|
|
|
parser:
|
|
cat src/parser/seclang-parser.hh | sed "s/return \*new (yyas_<T> ()) T (t)/return *new (yyas_<T> ()) T (std::move((T\&)t))/g" > src/parser/seclang-parser.hh.fix && mv src/parser/seclang-parser.hh.fix src/parser/seclang-parser.hh
|
|
|
|
|
|
|
|
cppcheck:
|
|
@cppcheck -U YYSTYPE -U MBEDTLS_MD5_ALT -U MBEDTLS_SHA1_ALT \
|
|
-D MS_CPPCHECK_DISABLED_FOR_PARSER -U YY_USER_INIT \
|
|
--suppressions-list=./test/cppcheck_suppressions.txt \
|
|
--inline-suppr \
|
|
--enable=warning,style,performance,portability,unusedFunction,missingInclude \
|
|
--inconclusive \
|
|
--template="warning: {file},{line},{severity},{id},{message}" \
|
|
-I headers -I . -I others -I src -I others/mbedtls -I src/parser \
|
|
--error-exitcode=1 \
|
|
-i "src/parser/seclang-parser.cc" -i "src/parser/seclang-scanner.cc" \
|
|
--force --verbose .
|
|
|
|
|
|
check-static: cppcheck
|
|
|
|
check-style: check-coding-style
|
|
|
|
check-coding-style:
|
|
@cpplint.py \
|
|
$$(find . -name "*.h" -o -name "*.cc" | xargs) 2>&1 \
|
|
| egrep -v $$(echo -n "catchall" ; \
|
|
for i in $$(cat test/coding_style_suppressions.txt); do echo -n "|"$$i; done) \
|
|
| sed 's/^\./warning: ./g' > coding-style.txt
|
|
-cat coding-style.txt
|
|
|
|
|
|
@VALGRIND_CHECK_RULES@
|
|
VALGRIND_SUPPRESSIONS_FILES = valgrind_suppressions.txt
|
|
|
|
LOG_DRIVER = env $(SHELL) $(top_srcdir)/test/custom-test-driver
|
|
AM_TESTS_ENVIRONMENT=AUTOMAKE_TESTS=true; export AUTOMAKE_TESTS;
|
|
LOG_COMPILER=test/test-suite.sh
|
|
|
|
TESTS=
|
|
include test/test-suite.in
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = modsecurity.pc
|
|
EXTRA_DIST = modsecurity.pc.in \
|
|
modsecurity.conf-recommended \
|
|
unicode.mapping
|
|
|