# HG changeset patch
# User dmeetry
# Date 1354736661 -14400
# Node ID 1d37792f52db64e7133ec1613cbf8efe39a9d738
# Parent  dd2aef354fed4f402644050c43bcc06d018005d1
7192744: fix up tests to accommodate jtreg spec change
Reviewed-by: jjg

diff -r dd2aef354fed -r 1d37792f52db test/tools/javac/processing/6348499/T6348499.java
--- 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();
diff -r dd2aef354fed -r 1d37792f52db test/tools/javac/processing/T6920317.java
--- 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");