Merge pull request #4499 from Greg091/disabled-valgrind-defrag-tests

test: disable Valgrind in specified defrag test cases

src/test/obj_defrag_advanced/TESTS.py

@@ -32,10 +32,14 @@
 #
 
 import testframework as t
+import valgrind as vg
 
 
 class ObjDefragAdvanced(t.BaseTest):
     test_type = t.Short
+    # These tests last too long under drd
+    # Exceptions: test no. 2
+    drd = t.DISABLE
 
     max_nodes = 50
     max_edges = 10
@@ -75,6 +79,10 @@ class TEST1(ObjDefragAdvanced):
 class TEST2(ObjDefragAdvanced):
     test_type = t.Medium
     fs = t.Pmem
+    # This test last too long under helgrind
+    helgrind = t.DISABLE
+    # Restore defaults
+    drd = vg.AUTO
 
     max_nodes = 512
     max_edges = 64
@@ -117,6 +125,11 @@ class TEST4(ObjDefragAdvancedMt):
 
 
 class TEST5(ObjDefragAdvancedMt):
+    # This test last too long under helgrind/memcheck/pmemcheck
+    helgrind = t.DISABLE
+    memcheck = t.DISABLE
+    pmemcheck = t.DISABLE
+
     max_nodes = 256
     max_edges = 32
     graph_copies = 5

src/test/obj_fragmentation2/TESTS.py

 #!../env.py
 #
-# Copyright 2019, Intel Corporation
+# Copyright 2019-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -34,24 +34,65 @@
 from os import path
 
 import testframework as t
+import valgrind as vg
 
 
 class BASE(t.BaseTest):
     test_type = t.Long
     fs = t.Pmem
     build = t.Release
+    # These tests last too long under drd/helgrind/memcheck/pmemcheck
+    # Exceptions: workloads no. 6 and 8 under memcheck/pmemcheck
+    drd = t.DISABLE
+    helgrind = t.DISABLE
+    memcheck = t.DISABLE
+    pmemcheck = t.DISABLE
     seed = '12345'
+    defrag = '1'
 
     def run(self, ctx):
         testfile = path.join(ctx.testdir, 'testfile')
-        ctx.env = {'PMEM_NO_FLUSH': '1'} # this test is extremely long otherwise
+        # this test is extremely long otherwise
+        ctx.env = {'PMEM_NO_FLUSH': '1'}
         ctx.exec('obj_fragmentation2',
-                 testfile, self.workload, self.seed, self.defrag)
+                 testfile, str(self.testnum), self.seed, self.defrag)
 
 
-testnum = 0
-for workload in ['0', '1', '2', '3', '4', '5', '6', '7', '8']:
-    for defrag in ['1']:
-        type("TEST" + str(testnum), (BASE, ),
-             {"workload": workload, "defrag": defrag})
-        testnum += 1
+class TEST0(BASE):
+    pass
+
+
+class TEST1(BASE):
+    pass
+
+
+class TEST2(BASE):
+    pass
+
+
+class TEST3(BASE):
+    pass
+
+
+class TEST4(BASE):
+    pass
+
+
+class TEST5(BASE):
+    pass
+
+
+class TEST6(BASE):
+    # Restore defaults
+    memcheck = vg.AUTO
+    pmemcheck = vg.AUTO
+
+
+class TEST7(BASE):
+    pass
+
+
+class TEST8(BASE):
+    # Restore defaults
+    memcheck = vg.AUTO
+    pmemcheck = vg.AUTO