Do not set do_perf_steps for Build-Ubuntu-GCC-x86_64-Release-SwarmingValgrind

tools/buildbot_spec.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
@@ skipping 283 matching lines @@
     configuration = builder_dict.get(
         'configuration', CONFIG_DEBUG)
   arch = (builder_dict.get('arch') or builder_dict.get('target_arch'))
   if ('Win' in builder_dict.get('os', '') and arch == 'x86_64'):
     configuration += '_x64'
   rv['configuration'] = configuration
   rv['do_test_steps'] = role == builder_name_schema.BUILDER_ROLE_TEST
   rv['do_perf_steps'] = (role == builder_name_schema.BUILDER_ROLE_PERF or
                          (role == builder_name_schema.BUILDER_ROLE_TEST and
                           configuration == CONFIG_DEBUG))
-  if 'Valgrind' in builder_name:
+  if rv['do_test_steps'] and 'Valgrind' in builder_name:
     rv['do_perf_steps'] = True
   if 'GalaxyS4' in builder_name:
     rv['do_perf_steps'] = False
 
   rv['build_targets'] = build_targets_from_builder_dict(
         builder_dict, rv['do_test_steps'], rv['do_perf_steps'])
 
   # Do we upload perf results?
   upload_perf_results = False
   if role == builder_name_schema.BUILDER_ROLE_PERF:
@@ skipping 79 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_builder_spec(sys.argv[2]), out)