Changeset 72ebe64 in mod_gnutls

Timestamp:

Jan 26, 2020, 12:56:53 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

e2200db

Parents:

f042405

Message:

runtest.py: Support for running Apache with Valgrind

Not used by "make check" yet.

Location:

test

Files:

• mgstest/services.py (modified) (1 diff)
• runtest.py (modified) (2 diffs)

test/mgstest/services.py

@@ -162 +162 @@
     apache2 = os.environ.get('APACHE2', 'apache2')
 
-    def __init__(self, config, env=None, pidfile=None, check=None):
+    def __init__(self, config, env=None, pidfile=None, check=None,
+                 valgrind_log=None):
         self.config = Path(config).resolve()
+        self.forking = True
         base_cmd = [self.apache2, '-f', str(self.config), '-k']
+        start_cmd = base_cmd + ['start']
+        stop_cmd = base_cmd + ['stop']
+        if valgrind_log:
+            start_cmd = ['valgrind', '-s', '--leak-check=full',
+                         '--track-origins=yes', '--vgdb=no',
+                         f'--log-file={valgrind_log}'] \
+                         + start_cmd + ['-DFOREGROUND']
+            self.forking = False
         if not check:
             check = self.pidfile_check
-        super(ApacheService, self).__init__(start=base_cmd + ['start'],
-                                            stop=base_cmd + ['stop'],
-                                            forking=True,
+        super(ApacheService, self).__init__(start=start_cmd,
+                                            stop=stop_cmd,
+                                            forking=self.forking,
                                             env=env,
                                             pidfile=pidfile,

test/runtest.py

@@ -111 +111 @@
         pidaffix = f'-{testname}'
 
+    valgrind_log = None
+    if args.valgrind:
+        valgrind_log = os.path.join('logs', f'valgrind-{testname}.log')
+
     # Define the available services
     apache = ApacheService(config=os.path.join(testdir, 'apache.conf'),
-                           pidfile=f'apache2{pidaffix}.pid')
+                           pidfile=f'apache2{pidaffix}.pid',
+                           valgrind_log=valgrind_log)
     backend = ApacheService(config=os.path.join(testdir, 'backend.conf'),
                             pidfile=f'backend{pidaffix}.pid')
@@ -217 +222 @@
                         default=temp_logfile(),
                         help='write HTTP responses to this file')
+    parser.add_argument('--valgrind', action='store_true',
+                        help='run primary Apache instance with Valgrind')
 
     # enable bash completion if argcomplete is available