[tools] Fix merging sancov files from multiple test attempts

tools/sanitizers/sancov_merger_test.py

Index: tools/sanitizers/sancov_merger_test.py
diff --git a/tools/sanitizers/sancov_merger_test.py b/tools/sanitizers/sancov_merger_test.py
index 93b89eb8a7b2fd47af56f55aeb47dd55d1a08ebd..899c716a5a4e40a20c674ef5799dde3504d583cd 100644
--- a/tools/sanitizers/sancov_merger_test.py
+++ b/tools/sanitizers/sancov_merger_test.py
@@ -11,19 +11,19 @@ import sancov_merger
 # executable name -> file list.
 FILE_MAP = {
   'd8': [
-    'd8.test.1.sancov',
-    'd8.test.2.sancov',
-    'd8.test.3.sancov',
-    'd8.test.4.sancov',
-    'd8.test.5.sancov',
-    'd8.test.6.sancov',
-    'd8.test.7.sancov',
+    'd8.test.1.1.sancov',
+    'd8.test.2.1.sancov',
+    'd8.test.3.1.sancov',
+    'd8.test.4.1.sancov',
+    'd8.test.5.1.sancov',
+    'd8.test.5.2.sancov',
+    'd8.test.6.1.sancov',
   ],
   'cctest': [
-    'cctest.test.1.sancov',
-    'cctest.test.2.sancov',
-    'cctest.test.3.sancov',
-    'cctest.test.4.sancov',
+    'cctest.test.1.1.sancov',
+    'cctest.test.2.1.sancov',
+    'cctest.test.3.1.sancov',
+    'cctest.test.4.1.sancov',
   ],
 }
 
@@ -32,42 +32,42 @@ FILE_MAP = {
 # (flag, path, executable name, intermediate result index, file list).
 EXPECTED_INPUTS_2 = [
   (False, '/some/path', 'cctest', 0, [
-    'cctest.test.1.sancov',
-    'cctest.test.2.sancov']),
+    'cctest.test.1.1.sancov',
+    'cctest.test.2.1.sancov']),
   (False, '/some/path', 'cctest', 1, [
-    'cctest.test.3.sancov',
-    'cctest.test.4.sancov']),
+    'cctest.test.3.1.sancov',
+    'cctest.test.4.1.sancov']),
   (False, '/some/path', 'd8', 0, [
-    'd8.test.1.sancov',
-    'd8.test.2.sancov',
-    'd8.test.3.sancov',
-    'd8.test.4.sancov']),
+    'd8.test.1.1.sancov',
+    'd8.test.2.1.sancov',
+    'd8.test.3.1.sancov',
+    'd8.test.4.1.sancov']),
   (False, '/some/path', 'd8', 1, [
-    'd8.test.5.sancov',
-    'd8.test.6.sancov',
-    'd8.test.7.sancov']),
+    'd8.test.5.1.sancov',
+    'd8.test.5.2.sancov',
+    'd8.test.6.1.sancov']),
 ]
 
 
 # The same for 4 cpus.
 EXPECTED_INPUTS_4 = [
   (True, '/some/path', 'cctest', 0, [
-    'cctest.test.1.sancov',
-    'cctest.test.2.sancov']),
+    'cctest.test.1.1.sancov',
+    'cctest.test.2.1.sancov']),
   (True, '/some/path', 'cctest', 1, [
-    'cctest.test.3.sancov',
-    'cctest.test.4.sancov']),
+    'cctest.test.3.1.sancov',
+    'cctest.test.4.1.sancov']),
   (True, '/some/path', 'd8', 0, [
-    'd8.test.1.sancov',
-    'd8.test.2.sancov']),
+    'd8.test.1.1.sancov',
+    'd8.test.2.1.sancov']),
   (True, '/some/path', 'd8', 1, [
-    'd8.test.3.sancov',
-    'd8.test.4.sancov']),
+    'd8.test.3.1.sancov',
+    'd8.test.4.1.sancov']),
   (True, '/some/path', 'd8', 2, [
-    'd8.test.5.sancov',
-    'd8.test.6.sancov']),
+    'd8.test.5.1.sancov',
+    'd8.test.5.2.sancov']),
   (True, '/some/path', 'd8', 3, [
-    'd8.test.7.sancov'])]
+    'd8.test.6.1.sancov'])]
 
 
 class MergerTests(unittest.TestCase):