test/hotspot/jtreg/gc/g1/numa/TestG1NUMATouchRegions.java

rev 56822 : imported patch 8220310.mut.1
rev 56823 : imported patch 8220310.mut.2
rev 56824 : imported patch 8220310.mut.3
rev 56825 : imported patch 8220310.mut.4
rev 56835 : imported patch 8220312.stat.3

@@ -109,35 +109,35 @@
     //    +UseLargePages: large page size <= G1HeapRegionSize
     //
     //    Each 'int' represents a numa id of single HeapRegion (bottom page).
     //    e.g. 1MB heap region, 2MB page size and 2 NUMA nodes system
     //         Check the first set(2 regions)
-    //         0| ...omitted..| 00
-    //         1| ...omitted..| 01
+    //         0| ...omitted..| 0
+    //         1| ...omitted..| 1
     static void checkCase1Pattern(OutputAnalyzer output, int index, long g1HeapRegionSize, long actualPageSize, int[] memoryNodeIds) throws Exception {
         StringBuilder sb = new StringBuilder();
 
         // Append index which means heap region index.
         sb.append(String.format("%6d", index));
         sb.append("| .* | ");
 
         // Append page node id.
-        sb.append(String.format("%02d", memoryNodeIds[index]));
+        sb.append(memoryNodeIds[index]);
 
         output.shouldMatch(sb.toString());
     }
 
     // 3. +UseLargePages: large page size > G1HeapRegionSize
     //
     //    As a OS page is consist of multiple heap regions, log also should be
     //    printed multiple times for same numa id.
     //    e.g. 1MB heap region, 2MB page size and 2 NUMA nodes system
     //         Check the first set(4 regions)
-    //         0| ...omitted..| 00
-    //         1| ...omitted..| 00
-    //         2| ...omitted..| 01
-    //         3| ...omitted..| 01
+    //         0| ...omitted..| 0
+    //         1| ...omitted..| 0
+    //         2| ...omitted..| 1
+    //         3| ...omitted..| 1
     static void checkCase2Pattern(OutputAnalyzer output, int index, long g1HeapRegionSize, long actualPageSize, int[] memoryNodeIds) throws Exception {
         StringBuilder sb = new StringBuilder();
 
         // Append page range.
         int lines_to_print = (int)(actualPageSize / g1HeapRegionSize);

@@ -145,11 +145,11 @@
             // Append index which means heap region index.
             sb.append(String.format("%6d", index * lines_to_print + i));
             sb.append("| .* | ");
 
             // Append page node id.
-            sb.append(String.format("%02d", memoryNodeIds[index]));
+            sb.append(memoryNodeIds[index]);
 
             output.shouldMatch(sb.toString());
             sb.setLength(0);
         }
     }