test/gc/g1/plab/lib/PLABUtils.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -32,30 +32,30 @@
  * Utilities for PLAB testing.
  */
 public class PLABUtils {
 
     /**
-     * List of VM options for GC tuning.
+     * PLAB tests default options list
      */
     private final static String[] GC_TUNE_OPTIONS = {
         "-XX:+UseG1GC",
+        "-XX:G1HeapRegionSize=1m",
         "-XX:OldSize=64m",
         "-XX:-UseAdaptiveSizePolicy",
         "-XX:-UseTLAB",
         "-XX:SurvivorRatio=1"
     };
 
     /**
-     * List of options for GC logging.
+     * GC logging options list.
      */
     private final static String G1_PLAB_LOGGING_OPTIONS[] = {
-        "-XX:+PrintPLAB",
-        "-XX:+PrintGC"
+        "-Xlog:gc=debug,gc+plab=debug"
     };
 
     /**
-     * List of options for WhiteBox using.
+     * List of options required to use WhiteBox.
      */
     private final static String WB_DIAGNOSTIC_OPTIONS[] = {
         "-Xbootclasspath/a:.",
         "-XX:+UnlockDiagnosticVMOptions",
         "-XX:+WhiteBoxAPI"

@@ -65,19 +65,19 @@
      * Prepares options for testing.
      *
      * @param options - additional options for testing
      * @return List of options
      */
-    public static List<String> prepareOptions(String... options) {
+    public static List<String> prepareOptions(List<String> options) {
         if (options == null) {
             throw new IllegalArgumentException("Options cannot be null");
         }
         List<String> executionOtions = new ArrayList<>(
                 Arrays.asList(Utils.getTestJavaOpts())
         );
         Collections.addAll(executionOtions, WB_DIAGNOSTIC_OPTIONS);
         Collections.addAll(executionOtions, G1_PLAB_LOGGING_OPTIONS);
         Collections.addAll(executionOtions, GC_TUNE_OPTIONS);
-        Collections.addAll(executionOtions, options);
+        executionOtions.addAll(options);
         return executionOtions;
     }
 }