< prev index next >

test/jdk/demo/jfc/J2Ddemo/J2DdemoTest.java

Print this page

        

*** 37,47 **** public static void main(String args[]) throws Exception { DemoRun test; /* Run the J2Ddemo.jar with the -runs=1 option */ ! test = new DemoRun("jfc/J2Ddemo/J2Ddemo.jar", "-runs=1"); test.runit(); /* Make sure patterns in output look ok */ if (test.output_contains("ERROR")) { throw new RuntimeException("Test failed - ERROR seen in output"); --- 37,47 ---- public static void main(String args[]) throws Exception { DemoRun test; /* Run the J2Ddemo.jar with the -runs=1 option */ ! test = new DemoRun("demo/jfc/J2Ddemo/J2Ddemo.jar", "-runs=1"); test.runit(); /* Make sure patterns in output look ok */ if (test.output_contains("ERROR")) { throw new RuntimeException("Test failed - ERROR seen in output");
*** 156,177 **** cmdLine += (cmd[i++] = vopt); cmdLine += " "; } cmdLine += (cmd[i++] = "-jar"); cmdLine += " "; ! 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); /* Begin process */ Process p; --- 156,166 ---- cmdLine += (cmd[i++] = vopt); cmdLine += " "; } cmdLine += (cmd[i++] = "-jar"); cmdLine += " "; ! cmdLine += (cmd[i++] = sdk_home + File.separator + demo_name); cmdLine += " "; cmdLine += (cmd[i++] = demo_options); /* Begin process */ Process p;
< prev index next >