Mercurial > hg > release > icedtea7-forest-2.3 > langtools
changeset 1384:1d37792f52db
7192744: fix up tests to accommodate jtreg spec change
Reviewed-by: jjg
author | dmeetry |
---|---|
date | Wed, 05 Dec 2012 23:44:21 +0400 |
parents | dd2aef354fed |
children | c84d318736e4 |
files | test/tools/javac/processing/6348499/T6348499.java test/tools/javac/processing/T6920317.java |
diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/test/tools/javac/processing/6348499/T6348499.java Tue Feb 19 17:14:11 2013 -0800 +++ b/test/tools/javac/processing/6348499/T6348499.java Wed Dec 05 23:44:21 2012 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2012, 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 @@ -47,6 +47,7 @@ public static void main(String... args) { String testSrc = System.getProperty("test.src", "."); String testClasses = System.getProperty("test.classes"); + String testClassPath = System.getProperty("test.class.path", testClasses); String A_java = new File(testSrc, "A.java").getPath(); JavacTool tool = JavacTool.create(); MyDiagListener dl = new MyDiagListener(); @@ -55,7 +56,7 @@ fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, "A.java"))); Iterable<String> opts = Arrays.asList("-proc:only", "-processor", "A", - "-processorpath", testClasses); + "-processorpath", testClassPath); StringWriter out = new StringWriter(); JavacTask task = tool.getTask(out, fm, dl, opts, null, files); task.call();
--- a/test/tools/javac/processing/T6920317.java Tue Feb 19 17:14:11 2013 -0800 +++ b/test/tools/javac/processing/T6920317.java Wed Dec 05 23:44:21 2012 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2012, 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 @@ -156,7 +156,9 @@ String expect = null; opts.add("-processorpath"); - opts.add(System.getProperty("test.classes")); + String testClasses = System.getProperty("test.classes"); + String testClassPath = System.getProperty("test.class.path", testClasses); + opts.add(testClassPath); opts.add("-processor"); opts.add(Processor.class.getName()); opts.add("-proc:only");