]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
valgrind: add strptime suppressions
authorSage Weil <sage@inktank.com>
Wed, 4 Jul 2012 21:29:55 +0000 (14:29 -0700)
committerSage Weil <sage@inktank.com>
Wed, 4 Jul 2012 21:29:55 +0000 (14:29 -0700)
Precise's strptime triggers valgrind false positives.

Use ship_utilities to push the valgrind.supp file over, which is a bit
slippy.

teuthology/misc.py
teuthology/task/ceph.py
teuthology/task/valgrind.supp [new file with mode: 0644]

index 5c6c113925a07f38b5c3290cdc5c35f1c9ea7edf..db3133cf974379b841a3a56833f2deec0d3fd8ee 100644 (file)
@@ -493,13 +493,16 @@ def get_valgrind_args(name, v):
     if '--tool=memcheck' in v or '--tool=helgrind' in v:
         extra_args = [
             '/tmp/cephtest/chdir-coredump',
-            'valgrind', '--xml=yes',
+            'valgrind',
+            '--suppressions=/tmp/cephtest/valgrind.supp',
+            '--xml=yes',
             '--xml-file={vdir}/{n}.log'.format(vdir=val_path, n=name)
             ]
     else:
         extra_args = [
             '/tmp/cephtest/chdir-coredump',
             'valgrind',
+            '--suppressions=/tmp/cephtest/valgrind.supp',
             '--log-file={vdir}/{n}.log'.format(vdir=val_path, n=name)
             ]
     extra_args.extend(v)
index 314a3268abefd6246409faf2200edfa3b011a138..4003555080d09154bf1cc96ac6b4aa7e2e7e1ddd 100644 (file)
@@ -121,7 +121,8 @@ def ceph_log(ctx, config):
 @contextlib.contextmanager
 def ship_utilities(ctx, config):
     assert config is None
-    FILES = ['daemon-helper', 'enable-coredump', 'chdir-coredump']
+    FILES = ['daemon-helper', 'enable-coredump', 'chdir-coredump',
+             'valgrind.supp']
     for filename in FILES:
         log.info('Shipping %r...', filename)
         src = os.path.join(os.path.dirname(__file__), filename)
diff --git a/teuthology/task/valgrind.supp b/teuthology/task/valgrind.supp
new file mode 100644 (file)
index 0000000..da4bb5e
--- /dev/null
@@ -0,0 +1,21 @@
+{
+        strptime suckage
+        Memcheck:Cond
+        fun:__GI___strncasecmp_l
+        fun:__strptime_internal
+        ...
+}
+{
+        strptime suckage 2
+        Memcheck:Value8
+        fun:__GI___strncasecmp_l
+        fun:__strptime_internal
+        ...
+}
+{
+        strptime suckage 3
+        Memcheck:Addr8
+        fun:__GI___strncasecmp_l
+        fun:__strptime_internal
+        ...
+}