Changeset 99c61f9 in mod_gnutls

Timestamp:

Jan 28, 2020, 3:37:37 AM (3 weeks ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

e46d203

Parents:

c5f8e85

Message:

Add configure option --enable-valgrind-test to run tests with Valgrind

Also includes suppressions for known issues not caused by mod_gnutls.

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (3 diffs)
• test/mgstest/services.py (modified) (1 diff)
• test/runtest.py (modified) (2 diffs)
• test/suppressions.valgrind (added)
• test/test-template.bash.in (modified) (1 diff)

configure.ac

@@ -87 +87 @@
 AM_PATH_PYTHON([3])
 AX_PYTHON_MODULE([yaml], [fatal])
+
+dnl Enable testing with Valgrind? Default is "no".
+AC_ARG_ENABLE([valgrind-test],
+        AS_HELP_STRING([--enable-valgrind-test], [Enable running \
+        tests with Valgrind (slow)]),
+        [use_valgrind=$enableval], [use_valgrind=no])
+AC_MSG_CHECKING([whether to run tests with Valgrind])
+AC_MSG_RESULT([$use_valgrind])
+AC_PATH_PROG([VALGRIND], [valgrind], [no])
+AS_IF([test "${use_valgrind}" != "no" -a "${VALGRIND}" = "no"],
+      [AC_MSG_ERROR([Valgrind test are enabled, but "valgrind" not \
+      found in PATH!])])
+AM_CONDITIONAL([ENABLE_VALGRIND], [test "${use_valgrind}" != "no"])
 
 dnl Optionally disable flock

test/Makefile.am

@@ -1 +1 @@
 SUBDIRS = tests
+
+VALGRIND_SUPPRESS = suppressions.valgrind
+EXTRA_DIST = $(VALGRIND_SUPPRESS)
+
+if ENABLE_VALGRIND
+valgrind = --valgrind \
+        $(foreach supp,$(VALGRIND_SUPPRESS),--valgrind-suppressions "$(srcdir)/$(supp)")
+else
+valgrind =
+endif
 
 # Generate the test scripts
 test-%.bash: test-template.bash.in | tests/%/
-        testname="$(*)"; sed s/@NUMBER@/$${testname%%_*}/ < $< > $@
+        testname="$(*)"; \
+        sed -e s/_NUM_/$${testname%%_*}/ -e 's,_VALGRIND_,$(valgrind),' < $< > $@
         chmod a+x $@
 
@@ -264 +275 @@
 test_doc = README.md sample_fail.yml sample_test.yml
 
-EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
+EXTRA_DIST += $(apache_data) $(cert_templates) $(shared_identities:=/uid.in) \
         authority/server/crl.template $(test_doc)
 
@@ -318 +329 @@
 endif
 
+if ENABLE_VALGRIND
+AM_TESTS_ENVIRONMENT += export VALGRIND="@VALGRIND@";
+endif
+
 if ENABLE_NETNS
 AM_TESTS_ENVIRONMENT += export UNSHARE="@UNSHARE@"; \

test/mgstest/services.py

@@ -158 +158 @@
 
     def __init__(self, config, env=None, pidfile=None, check=None,
-                 valgrind_log=None):
+                 valgrind_log=None, valgrind_suppress=[]):
         self.config = Path(config).resolve()
         base_cmd = [self.apache2, '-f', str(self.config), '-k']
         start_cmd = base_cmd + ['start', '-DFOREGROUND']
         if valgrind_log:
-            start_cmd = ['valgrind', '-s', '--leak-check=full',
+            valgrind = os.environ.get('VALGRIND', 'valgrind')
+            suppress = [f'--suppressions={s}' for s in valgrind_suppress]
+            start_cmd = [valgrind, '-s', '--leak-check=full',
                          '--track-origins=yes', '--vgdb=no',
                          f'--log-file={valgrind_log}'] \
-                         + start_cmd
+                         + suppress + start_cmd
         if not check:
             check = self.pidfile_check

test/runtest.py

@@ -118 +118 @@
     apache = ApacheService(config=os.path.join(testdir, 'apache.conf'),
                            pidfile=f'apache2{pidaffix}.pid',
-                           valgrind_log=valgrind_log)
+                           valgrind_log=valgrind_log,
+                           valgrind_suppress=args.valgrind_suppressions)
     backend = ApacheService(config=os.path.join(testdir, 'backend.conf'),
                             pidfile=f'backend{pidaffix}.pid')
@@ -221 +222 @@
     parser.add_argument('--valgrind', action='store_true',
                         help='run primary Apache instance with Valgrind')
+    parser.add_argument('--valgrind-suppressions', action='append',
+                        default=[],
+                        help='use Valgrind suppressions file')
 
     # enable bash completion if argcomplete is available

test/test-template.bash.in

@@ -1 +1 @@
 #!/bin/bash
-. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number @NUMBER@
+. ${srcdir}/netns_py.bash ${srcdir}/runtest.py --test-number _NUM_ _VALGRIND_