181 int failcount = 0; |
181 int failcount = 0; |
182 String bStr = refVersion.substring(refVersion.lastIndexOf("build") + |
182 String bStr = refVersion.substring(refVersion.lastIndexOf("build") + |
183 "build".length() + 1, |
183 "build".length() + 1, |
184 refVersion.lastIndexOf(")")); |
184 refVersion.lastIndexOf(")")); |
185 |
185 |
186 String[] vStr = bStr.split("\\.|-|_"); |
|
187 String jdkMajor = vStr[0]; |
|
188 String jdkMinor = vStr[1]; |
|
189 String jdkMicro = vStr[2]; |
|
190 String jdkBuild = vStr[vStr.length - 1]; |
|
191 |
|
192 String expectedDotVersion = "dotversion:" + jdkMajor + "." + jdkMinor; |
|
193 String expectedFullVersion = "fullversion:" + bStr; |
186 String expectedFullVersion = "fullversion:" + bStr; |
194 |
187 |
195 Map<String, String> envMap = new HashMap<>(); |
188 Map<String, String> envMap = new HashMap<>(); |
196 envMap.put(TestHelper.JLDEBUG_KEY, "true"); |
189 envMap.put(TestHelper.JLDEBUG_KEY, "true"); |
197 TestHelper.TestResult tr = doExec(envMap, javaCmd, "-version"); |
190 TestHelper.TestResult tr = doExec(envMap, javaCmd, "-version"); |
198 List<String> alist = new ArrayList<>(); |
191 List<String> alist = new ArrayList<>(); |
199 alist.addAll(tr.testOutput); |
192 alist.addAll(tr.testOutput); |
200 for (String x : tr.testOutput) { |
193 for (String x : tr.testOutput) { |
201 alist.add(x.trim()); |
194 alist.add(x.trim()); |
202 } |
|
203 if (!alist.contains(expectedDotVersion)) { |
|
204 System.out.println("Error: could not find " + expectedDotVersion); |
|
205 failcount++; |
|
206 } |
195 } |
207 |
196 |
208 if (!alist.contains(expectedFullVersion)) { |
197 if (!alist.contains(expectedFullVersion)) { |
209 System.out.println("Error: could not find " + expectedFullVersion); |
198 System.out.println("Error: could not find " + expectedFullVersion); |
210 failcount++; |
199 failcount++; |