stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8224778: test/jdk/demo/jfc/J2Ddemo/J2DdemoTest.java cannot find J2Ddemo.jar

Browse Source 
Reviewed-by: erikj, psadhukhan
This commit is contained in:
Phil Race 2019-05-27 12:24:26 -07:00
parent a34bbe6c30
commit d655301d49
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/RunTests.gmk
View File

@ -881,7 +881,8 @@ define SetupRunJtregTestBody
$1_JTREG_BASIC_OPTIONS += -e:JIB_HOME=$$(JIB_HOME)
endif
$1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=${TEST_IMAGE_DIR}/hotspot/jtreg/graal
$1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_DIR=$(TEST_IMAGE_DIR)
$1_JTREG_BASIC_OPTIONS += -e:TEST_IMAGE_GRAAL_DIR=$(TEST_IMAGE_DIR)/hotspot/jtreg/graal
ifneq ($$(JTREG_FAILURE_HANDLER_OPTIONS), )
$1_JTREG_LAUNCHER_OPTIONS += -Djava.library.path="$(JTREG_FAILURE_HANDLER_DIR)"

15
test/jdk/demo/jfc/J2Ddemo/J2DdemoTest.java
View File

@ -39,7 +39,7 @@ public class J2DdemoTest {
DemoRun test;
/* Run the J2Ddemo.jar with the -runs=1 option */
test = new DemoRun("demo/jfc/J2Ddemo/J2Ddemo.jar", "-runs=1");
test = new DemoRun("jfc/J2Ddemo/J2Ddemo.jar", "-runs=1");
test.runit();
/* Make sure patterns in output look ok */
@ -158,7 +158,18 @@ public class J2DdemoTest {
}
cmdLine += (cmd[i++] = "-jar");
cmdLine += " ";
cmdLine += (cmd[i++] = sdk_home + File.separator + demo_name);
String demo_path;
String test_dir = System.getenv("TEST_IMAGE_DIR");
System.out.println("TEST_IMAGE_DIR="+test_dir);
if (test_dir != null) {
demo_path = test_dir + File.separator + "jdk" + File.separator +
"demos" + File.separator + demo_name;
} else {
demo_path = sdk_home + File.separator +
"demo" + File.separator + demo_name;
}
System.out.println("demo_path="+demo_path);
cmdLine += cmd[i++] = demo_path;
cmdLine += " ";
cmdLine += (cmd[i++] = demo_options);