Fix bug in mergetraces.py.

tools/cygprofile/mergetraces_unittest.py

Index: tools/cygprofile/mergetraces_unittest.py
diff --git a/tools/cygprofile/mergetraces_unittest.py b/tools/cygprofile/mergetraces_unittest.py
index 5a00bd6d9a03a0450a0a329f62c4cc0a1f38c6cc..0aa68c6614e3abfc2caab4624a97a8588a112a72 100644
--- a/tools/cygprofile/mergetraces_unittest.py
+++ b/tools/cygprofile/mergetraces_unittest.py
@@ -12,11 +12,11 @@ class GroupByProcessAndThreadIdTest(unittest.TestCase):
     input_trace = [
         (100, 10, '2000:2001', 0x5),
         (100, 11, '2000:2001', 0x3),
-        (100, 11, '2000:2000', 0x1),
-        (100, 12, '2001:2001', 0x6),
         (100, 13, '2000:2002', 0x8),
-        (100, 13, '2001:2002', 0x9),
-        (100, 14, '2000:2000', 0x7)
+        (100, 14, '2000:2000', 0x7),
+        (120, 13, '2001:2002', 0x9),
+        (150, 12, '2001:2001', 0x6),
+        (180, 11, '2000:2000', 0x1),
     ]
 
     # Functions should be grouped by thread-id and PIDs should not be
@@ -24,11 +24,11 @@ class GroupByProcessAndThreadIdTest(unittest.TestCase):
     expected_trace = [
         (100, 10, '2000:2001', 0x5),
         (100, 11, '2000:2001', 0x3),
-        (100, 11, '2000:2000', 0x1),
-        (100, 14, '2000:2000', 0x7),
         (100, 13, '2000:2002', 0x8),
-        (100, 12, '2001:2001', 0x6),
-        (100, 13, '2001:2002', 0x9)
+        (100, 14, '2000:2000', 0x7),
+        (180, 11, '2000:2000', 0x1),
+        (150, 12, '2001:2001', 0x6),

[pasko, 2014/06/06 09:14:15]

please make sure each tid uniquely identifies the pid in the test

[Philippe, 2014/06/06 09:30:48]

Done.

+        (120, 13, '2001:2002', 0x9),
     ]
 
     grouped_trace = mergetraces.GroupByProcessAndThreadId(input_trace)