apply feedback

Author: Baraa-Hasheesh

test/one/profiler/test/Runner.java

@@ -104,11 +104,9 @@ private static boolean applicable(Test test) {
         Arch[] arch = test.arch();
         Jvm[] jvm = test.jvm();
         int[] jvmVer = test.jvmVer();
-        Jvm additionalJvm = currentJvm == Jvm.HOTSPOT_C2 ? Jvm.HOTSPOT : null;
-
         return (os.length == 0 || Arrays.asList(os).contains(currentOs)) &&
                 (arch.length == 0 || Arrays.asList(arch).contains(currentArch)) &&
-                (jvm.length == 0 || Arrays.asList(jvm).contains(currentJvm) || Arrays.asList(jvm).contains(additionalJvm)) &&
+                (jvm.length == 0 || Arrays.asList(jvm).contains(currentJvm) || (currentJvm == Jvm.HOTSPOT_C2 && Arrays.asList(jvm).contains(Jvm.HOTSPOT))) &&
                 (jvmVer.length == 0 || (currentJvmVersion >= jvmVer[0] && currentJvmVersion <= jvmVer[jvmVer.length - 1]));
     }
 

test/one/profiler/test/TestProcess.java

@@ -61,17 +61,17 @@ private static MethodHandle getPidHandle() {
     private final Test test;
     private final Os currentOs;
     private final String logDir;
-    private final Jvm currentJVM;
+    private final Jvm currentJvm;
     private final String[] inputs;
     private final Process p;
     private final Map<String, File> tmpFiles = new HashMap<>();
     private final int timeout = 30;
 
-    public TestProcess(Test test, Os currentOs, String logDir, Jvm currentJVM) throws Exception {
+    public TestProcess(Test test, Os currentOs, String logDir, Jvm currentJvm) throws Exception {
         this.test = test;
         this.currentOs = currentOs;
         this.logDir = logDir;
-        this.currentJVM = currentJVM;
+        this.currentJvm = currentJvm;
         this.inputs = test.inputs();
 
         List<String> cmd = buildCommandLine(test);
@@ -114,7 +114,7 @@ public Os currentOs() {
     }
 
     public Jvm currentJvm() {
-        return this.currentJVM;
+        return this.currentJvm;
     }
 
     public String profilerLibPath() {