diff --git a/tests/automation.js b/tests/automation.js index 5f83bfed..2c046451 100644 --- a/tests/automation.js +++ b/tests/automation.js @@ -226,17 +226,15 @@ casper.test.begin("unit tests", 37 + gfxTests.length, function(test) { .thenOpen("http://localhost:8000/index.html?logConsole=web,page&logLevel=log") .withFrame(0, basicUnitTests); - // TODO: Re-enable rerunning tests once we re-enable the JIT. - // Run the same unit tests again to test the compiled method cache. - /*casper + casper .thenOpen("http://localhost:8000/index.html?logConsole=web,page&logLevel=log") .withFrame(0, basicUnitTests); // Run the same unit tests again with baseline JIT enabled for all methods. casper .thenOpen("http://localhost:8000/index.html?logConsole=web,page&logLevel=log&forceRuntimeCompilation=1") - .withFrame(0, basicUnitTests);*/ + .withFrame(0, basicUnitTests); casper .thenOpen("http://localhost:8000/index.html?main=tests/isolate/TestIsolate&logLevel=info&logConsole=web,page,raw") diff --git a/tests/com/sun/midp/crypto/TestBouncyCastleSHA256.java b/tests/com/sun/midp/crypto/TestBouncyCastleSHA256.java index 3cd6e71f..e0e1de5a 100644 --- a/tests/com/sun/midp/crypto/TestBouncyCastleSHA256.java +++ b/tests/com/sun/midp/crypto/TestBouncyCastleSHA256.java @@ -5,7 +5,7 @@ import gnu.testlet.TestHarness; import gnu.testlet.Testlet; public class TestBouncyCastleSHA256 implements Testlet { - public int getExpectedPass() { return 6; } + public int getExpectedPass() { return 7; } public int getExpectedFail() { return 0; } public int getExpectedKnownFail() { return 0; } @@ -40,12 +40,10 @@ public class TestBouncyCastleSHA256 implements Testlet { th.check(Util.hexEncode(retValue).toLowerCase(), digests[i]); } - /* TODO: Re-enable when compilation is enabled. - for (int i = 0; i < 1000000; i++) { md.update((byte)'a'); } md.doFinal(retValue, 0); - th.check(Util.hexEncode(retValue).toLowerCase(), MILLION_A_DIGEST);*/ + th.check(Util.hexEncode(retValue).toLowerCase(), MILLION_A_DIGEST); } } diff --git a/tests/com/sun/midp/crypto/TestClasspathSHA256.java b/tests/com/sun/midp/crypto/TestClasspathSHA256.java index 3a4dc2d3..4e3c1f90 100644 --- a/tests/com/sun/midp/crypto/TestClasspathSHA256.java +++ b/tests/com/sun/midp/crypto/TestClasspathSHA256.java @@ -5,7 +5,7 @@ import gnu.testlet.TestHarness; import gnu.testlet.Testlet; public class TestClasspathSHA256 implements Testlet { - public int getExpectedPass() { return 6; } + public int getExpectedPass() { return 7; } public int getExpectedFail() { return 0; } public int getExpectedKnownFail() { return 0; } @@ -38,11 +38,9 @@ public class TestClasspathSHA256 implements Testlet { th.check(Util.hexEncode(md.digest()).toLowerCase(), digests[i]); } - /* TODO: Re-enable when compilation is enabled. - for (int i = 0; i < 1000000; i++) { md.update((byte)'a'); } - th.check(Util.hexEncode(md.digest()).toLowerCase(), MILLION_A_DIGEST);*/ + th.check(Util.hexEncode(md.digest()).toLowerCase(), MILLION_A_DIGEST); } }