test/tools/javac/processing/6430209/T6430209.java

*** 1,7 ****
  /*
!  * Copyright (c) 2006, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2006, 2010, 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.
*** 23,33 ****
  
  /*
   * @test
   * @bug 6441871
   * @summary spurious compiler error elicited by packageElement.getEnclosedElements()
!  * @build b6341534
   * @run main T6430209
   */
  
  // Note that 6441871 is an interim partial fix for 6430209 that just removes the javac
  // crash message and stacktrace
--- 23,34 ----
  
  /*
   * @test
   * @bug 6441871
   * @summary spurious compiler error elicited by packageElement.getEnclosedElements()
!  * @library ../../lib
!  * @build JavacTestingAbstractProcessor b6341534
   * @run main T6430209
   */
  
  // Note that 6441871 is an interim partial fix for 6430209 that just removes the javac
  // crash message and stacktrace
*** 52,62 ****
          fout.close();
  
          // run annotation processor b6341534 so we can check diagnostics
          // -proc:only -processor b6341534 -cp . ./src/*.java
          String testSrc = System.getProperty("test.src", ".");
!         String testClasses = System.getProperty("test.classes");
          JavacTool tool = JavacTool.create();
          MyDiagListener dl = new MyDiagListener();
          StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null);
          fm.setLocation(StandardLocation.CLASS_PATH, Arrays.asList(new File(".")));
          Iterable<? extends JavaFileObject> files = fm.getJavaFileObjectsFromFiles(Arrays.asList(
--- 53,63 ----
          fout.close();
  
          // run annotation processor b6341534 so we can check diagnostics
          // -proc:only -processor b6341534 -cp . ./src/*.java
          String testSrc = System.getProperty("test.src", ".");
!         String testClasses = System.getProperty("test.classes") + System.getProperty("path.separator") + "../../lib";
          JavacTool tool = JavacTool.create();
          MyDiagListener dl = new MyDiagListener();
          StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null);
          fm.setLocation(StandardLocation.CLASS_PATH, Arrays.asList(new File(".")));
          Iterable<? extends JavaFileObject> files = fm.getJavaFileObjectsFromFiles(Arrays.asList(