Valgrind: If running a specific list of layout tests, do not pass --run-chunk.

tools/valgrind/chrome_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 ''' Runs various chrome tests through valgrind_test.py.'''
 
 import glob
 import logging
 import multiprocessing
@@ skipping 494 matching lines @@
   def TestSyncIntegration(self):
     return self.SimpleTest("chrome", "sync_integration_tests",
                            valgrind_test_args=self.UI_VALGRIND_ARGS,
                            cmd_args=(["--ui-test-action-max-timeout=450000"]))
 
   def TestLayoutChunk(self, chunk_num, chunk_size):
     # Run tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size) from the
     # list of tests.  Wrap around to beginning of list at end.
     # If chunk_size is zero, run all tests in the list once.
     # If a text file is given as argument, it is used as the list of tests.
-    #
+    assert((chunk_size == 0) != (len(self._args) == 0))

[Timur Iskhodzhanov, 2014/08/05 09:28:01]

This is gonna fire if you pass contradictory flags to chrome_tests.sh, right? 
If so, can we make this a check-with-print rather than assert?

[Lei Zhang, 2014/08/06 01:53:07]

This only asserts if you pass "-n 0" without additional arguments. If one passes
arguments, it supersedes the -n switch.

     # Build the ginormous commandline in 'cmd'.
     # It's going to be roughly
     #  python valgrind_test.py ... python run_webkit_tests.py ...
     # but we'll use the --indirect flag to valgrind_test.py
     # to avoid valgrinding python.
     # Start by building the valgrind_test.py commandline.
     tool = valgrind_test.CreateTool(self._options.valgrind_tool)
     cmd = self._DefaultCommand(tool)
     cmd.append("--trace_children")
     cmd.append("--indirect_webkit_layout")
@@ skipping 59 matching lines @@
 
 
   def TestLayout(self):
     # A "chunk file" is maintained in the local directory so that each test
     # runs a slice of the layout tests of size chunk_size that increments with
     # each run.  Since tests can be added and removed from the layout tests at
     # any time, this is not going to give exact coverage, but it will allow us
     # to continuously run small slices of the layout tests under valgrind rather
     # than having to run all of them in one shot.
     chunk_size = self._options.num_tests
-    if (chunk_size == 0):
+    if chunk_size == 0 or len(self._args):
       return self.TestLayoutChunk(0, 0)
     chunk_num = 0
     chunk_file = os.path.join("valgrind_layout_chunk.txt")
     logging.info("Reading state from " + chunk_file)
     try:
       f = open(chunk_file)
       if f:
         chunk_str = f.read()
         if len(chunk_str):
           chunk_num = int(chunk_str)
@@ skipping 175 matching lines @@
 
   for t in options.test:
     tests = ChromeTests(options, args, t)
     ret = tests.Run()
     if ret: return ret
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(_main())