--- a/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java Fri Mar 29 09:31:44 2019 +0000
+++ b/test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java Mon Apr 01 12:44:23 2019 +0530
@@ -70,7 +70,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkInvalidUsageIndexTag();
@@ -97,7 +96,6 @@
"-Xdoclint:all",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.ERROR);
checkDocLintErrors();
@@ -124,7 +122,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(false);
@@ -150,7 +147,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(true);
@@ -177,7 +173,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(false);
@@ -201,7 +196,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(true);
@@ -226,7 +220,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
@@ -252,7 +245,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkInvalidUsageIndexTag();
@@ -280,7 +272,6 @@
"--disable-javafx-strict-checks",
"-package",
"-use",
- "--frames",
"pkgfx", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(true);
@@ -306,7 +297,6 @@
"-Xdoclint:none",
"-sourcepath", testSrc,
"-use",
- "--frames",
"pkg", "pkg1", "pkg2", "pkg3");
checkExit(Exit.OK);
checkSearchOutput(true, false);
@@ -373,7 +363,7 @@
}
void checkSearchOutput(boolean expectedOutput) {
- checkSearchOutput("overview-summary.html", expectedOutput, true);
+ checkSearchOutput("index.html", expectedOutput, true);
}
void checkSearchIndex(boolean expectedOutput) {
@@ -390,7 +380,7 @@
}
void checkSearchOutput(boolean expectedOutput, boolean moduleDirectoriesVar) {
- checkSearchOutput("overview-summary.html", expectedOutput, moduleDirectoriesVar);
+ checkSearchOutput("index.html", expectedOutput, moduleDirectoriesVar);
}
void checkSearchOutput(String fileName, boolean expectedOutput, boolean moduleDirectoriesVar) {