Add valgrind suppressions for ROOT if found (see ROOT-7510)

git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19677 4525493e-7705-40b1-a816-d608a930855b

src/CoolTest/qmtest/COOLTests.py

@@ -350,8 +350,6 @@ class StandardTest(ShellCommandTest):
             valgrindSupp = ''
             if 'CORAL_TESTSUITE_VALGRIND_SUPP' in os.environ:
                 valgrindSupp = ' --suppressions=' + os.path.abspath( os.environ['CORAL_TESTSUITE_VALGRIND_SUPP'] )
-            # Add as additional valgrind suppression file from ROOT
-            ###valgrindSupp += ' --suppressions=' + os.path.abspath( os.environ['ROOTSYS'] + '/etc/valgrind-root.supp' )
             # Define the path for the output valgrind log
             if 'CORAL_TESTSUITE_VALGRIND_LOGDIR' in os.environ:
               valgrindLog = os.environ['CORAL_TESTSUITE_VALGRIND_LOGDIR']
@@ -368,6 +366,11 @@ class StandardTest(ShellCommandTest):
             try: os.mkdir( valgrindLog )
             except OSError: pass
             valgrindLog = valgrindLog+'/valgrind.'+context[context.ID_CONTEXT_PROPERTY]+'.txt'
+            # Add valgrind suppressions for ROOT if found (see ROOT-7510)
+            if 'ROOTSYS' in os.environ:
+                rootSupp = os.environ['ROOTSYS'] + '/etc/valgrind-root.supp'
+                if os.path.isfile( rootSupp ):
+                    valgrindSupp += ' --suppressions=' + rootSupp
             # Redefine the valgrind command
             self.command = 'valgrind -v --leak-check=full --show-reachable=yes --error-limit=no --log-file='+valgrindLog+valgrindSupp+' --gen-suppressions=all --num-callers=50 --track-origins=yes '+self.command