--- a/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java Tue Apr 15 15:55:24 2014 -0700
+++ b/langtools/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java Wed Apr 16 16:17:09 2014 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
@@ -43,23 +43,23 @@
private static final String[] ARGS1 =
new String[] {
"-d", OUTPUT_DIR1, "-sourcepath", SRC_DIR,
- "-notimestamp", SRC_DIR + FS + "C5.java", "pkg1", "pkg2"
+ "-notimestamp", SRC_DIR + "/C5.java", "pkg1", "pkg2"
};
private static final String[] ARGS2 =
new String[] {
"-d", OUTPUT_DIR2, "-sourcepath", SRC_DIR,
- "-notimestamp", SRC_DIR + FS + "C5.java",
- SRC_DIR + FS + "pkg1" + FS + "C1.java",
- SRC_DIR + FS + "pkg1" + FS + "C2.java",
- SRC_DIR + FS + "pkg2" + FS + "C3.java",
- SRC_DIR + FS + "pkg2" + FS + "C4.java"
+ "-notimestamp", SRC_DIR + "/C5.java",
+ SRC_DIR + "/pkg1/C1.java",
+ SRC_DIR + "/pkg1/C2.java",
+ SRC_DIR + "/pkg2/C3.java",
+ SRC_DIR + "/pkg2/C4.java"
};
private static final String[][] FILES_TO_DIFF = {
- {OUTPUT_DIR1 + FS + "C5.html", OUTPUT_DIR2 + FS + "C5.html"},
- {OUTPUT_DIR2 + FS + "pkg1" + FS + "C1.html", OUTPUT_DIR2 + FS + "pkg1" + FS + "C1.html"},
- {OUTPUT_DIR1 + FS + "pkg1" + FS + "C2.html", OUTPUT_DIR2 + FS + "pkg1" + FS + "C2.html"},
- {OUTPUT_DIR1 + FS + "pkg2" + FS + "C3.html", OUTPUT_DIR2 + FS + "pkg2" + FS + "C3.html"},
- {OUTPUT_DIR1 + FS + "pkg2" + FS + "C4.html", OUTPUT_DIR2 + FS + "pkg2" + FS + "C4.html"}
+ {OUTPUT_DIR1 + "/C5.html", OUTPUT_DIR2 + "/C5.html"},
+ {OUTPUT_DIR2 + "/pkg1/C1.html", OUTPUT_DIR2 + "/pkg1/C1.html"},
+ {OUTPUT_DIR1 + "/pkg1/C2.html", OUTPUT_DIR2 + "/pkg1/C2.html"},
+ {OUTPUT_DIR1 + "/pkg2/C3.html", OUTPUT_DIR2 + "/pkg2/C3.html"},
+ {OUTPUT_DIR1 + "/pkg2/C4.html", OUTPUT_DIR2 + "/pkg2/C4.html"}
};
private static final String BUG_ID = "4506980";