Fixing jdk 8 test failure

This commit is contained in:
Joakim Erdfelt 2014-06-25 08:24:24 -07:00
parent 2a943887b6
commit bad3165d8a
2 changed files with 2 additions and 0 deletions

View File

@ -142,6 +142,7 @@ public class MainTest
File homePath = MavenTestingUtils.getTestResourceDir("usecases/home").getAbsoluteFile();
cmdLineArgs.add("jetty.home=" + homePath);
cmdLineArgs.add("user.dir=" + homePath);
cmdLineArgs.add("java.version=1.7.0_60");
// Modules
cmdLineArgs.add("--module=server");

View File

@ -46,6 +46,7 @@ LIB|${jetty.base}/lib/websocket/websocket-server-TEST.jar
LIB|${jetty.base}/lib/websocket/websocket-servlet-TEST.jar
# The Properties we expect (order is irrelevant)
PROP|java.version=1.7.0_60
PROP|jetty.keymanager.password=OBF:1u2u1wml1z7s1z7a1wnl1u2g
PROP|jetty.keystore=etc/keystore
PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4