<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114796] users/landonf/openjdk7/dports/java/openjdk7</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114796">114796</a></dd>
<dt>Author</dt> <dd>landonf@macports.org</dd>
<dt>Date</dt> <dd>2013-12-15 09:24:39 -0800 (Sun, 15 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a test harness and tests to validate the OpenJDK build.
Currently, we validate that the follow local patches were applied correctly:
- Rhino support.
- Correct JCE policy file bundled (either limited or unlimited).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#userslandonfopenjdk7dportsjavaopenjdk7Portfile">users/landonf/openjdk7/dports/java/openjdk7/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/landonf/openjdk7/dports/java/openjdk7/files/tests/</li>
<li><a href="#userslandonfopenjdk7dportsjavaopenjdk7filestestsRhinoTestjava">users/landonf/openjdk7/dports/java/openjdk7/files/tests/RhinoTest.java</a></li>
<li><a href="#userslandonfopenjdk7dportsjavaopenjdk7filestestsUnlimitedJCETestjava">users/landonf/openjdk7/dports/java/openjdk7/files/tests/UnlimitedJCETest.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="userslandonfopenjdk7dportsjavaopenjdk7Portfile"></a>
<div class="modfile"><h4>Modified: users/landonf/openjdk7/dports/java/openjdk7/Portfile (114795 => 114796)</h4>
<pre class="diff"><span>
<span class="info">--- users/landonf/openjdk7/dports/java/openjdk7/Portfile 2013-12-15 17:17:43 UTC (rev 114795)
+++ users/landonf/openjdk7/dports/java/openjdk7/Portfile 2013-12-15 17:24:39 UTC (rev 114796)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> set jdk_build_date 26_aug_2013
</span><span class="cx">
</span><span class="cx"> version ${jdk_major_version}.${jport_minor_version}.${jport_build_number}
</span><del>-revision 4
</del><ins>+revision 5
</ins><span class="cx">
</span><span class="cx"> categories java
</span><span class="cx"> maintainers landonf openmaintainer
</span><span class="lines">@@ -85,6 +85,11 @@
</span><span class="cx"> port:ghc \
</span><span class="cx"> port:ruby
</span><span class="cx">
</span><ins>+set cryptoflag "UNLIMITED_CRYPTO=true"
+variant limited_strength_jce description {Use the limited stength JCE policy files. By default, the unlimited strength policy files will be included.} {
+ build.args-delete ${cryptoflag}
+}
+
</ins><span class="cx"> # Find a usable bootstrap VM
</span><span class="cx"> if {[file exists ${prefix}/share/java/openjdk7/bin/java]} {
</span><span class="cx"> # A previous OpenJDK7 release is already installed
</span><span class="lines">@@ -162,6 +167,7 @@
</span><span class="cx"> EXTRA_CFLAGS="-Wno-deprecated-declarations -I\"${filespath}/clang-compat-headers\"" \
</span><span class="cx"> LANG="C" \
</span><span class="cx"> "${bootflags}" \
</span><ins>+ "${cryptoflag}" \
</ins><span class="cx"> ALT_BOOTDIR="${bootstrapvm}" \
</span><span class="cx"> ALT_COMPILER_PATH="${prefix}" \
</span><span class="cx"> ANT_HOME="${workpath}/apache-ant-${ant_version}" \
</span><span class="lines">@@ -186,6 +192,29 @@
</span><span class="cx"> BUNDLE_VENDOR="MacPorts" \
</span><span class="cx"> HOTSPOT_BUILD_JOBS="${build.jobs}"
</span><span class="cx">
</span><ins>+test {
+ set testpath "${workpath}/tests"
+ set build "${worksrcpath}/build/macosx-${openjdk_build_arch}"
+
+ # Buld the tests
+ file mkdir ${testpath}
+ exec ${build}/bin/javac -d ${testpath} {*}[glob ${filespath}/tests/*.java]
+
+ # Create the variant list we'll pass to our test cases
+ set variants {}
+ foreach v $PortInfo(variants) {
+ if {[variant_isset $v]} {
+ lappend variants $v
+ }
+ }
+
+ # Execute
+ foreach class_file [glob -tails -directory ${testpath} *Test.class] {
+ set class [file rootname $class_file]
+ exec ${build}/bin/java -cp ${testpath} ${class} {*}$variants
+ }
+}
+
</ins><span class="cx"> # We violate mtree in two ways:
</span><span class="cx"> # - We install in $prefix/<name><major>. This has long been a standard path for installed JVMs
</span><span class="cx"> # and models the approach taken by the FreeBSD Java ports.
</span></span></pre></div>
<a id="userslandonfopenjdk7dportsjavaopenjdk7filestestsRhinoTestjava"></a>
<div class="addfile"><h4>Added: users/landonf/openjdk7/dports/java/openjdk7/files/tests/RhinoTest.java (0 => 114796)</h4>
<pre class="diff"><span>
<span class="info">--- users/landonf/openjdk7/dports/java/openjdk7/files/tests/RhinoTest.java (rev 0)
+++ users/landonf/openjdk7/dports/java/openjdk7/files/tests/RhinoTest.java 2013-12-15 17:24:39 UTC (rev 114796)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import java.util.Set;
+
+public class RhinoTest extends Base {
+ public static void main (String[] args) {
+ new RhinoTest().dispatch(args);
+ }
+
+ protected void run (Set<Variant> variants) {
+ ScriptEngine engine = new ScriptEngineManager().getEngineByName("JavaScript");
+ if (engine == null)
+ throw fail("Missing JavaScript engine");
+
+ Object result;
+ try {
+ result = engine.eval("1+1");
+ } catch (ScriptException e) {
+ throw fail("Failed to evaluate JS: " + e);
+ }
+
+ if (!result.equals(new Double(2.0)))
+ throw fail("Unexpected result: " + result);
+
+ pass("Computed result: " + result);
+ }
+}
</ins></span></pre></div>
<a id="userslandonfopenjdk7dportsjavaopenjdk7filestestsUnlimitedJCETestjava"></a>
<div class="addfile"><h4>Added: users/landonf/openjdk7/dports/java/openjdk7/files/tests/UnlimitedJCETest.java (0 => 114796)</h4>
<pre class="diff"><span>
<span class="info">--- users/landonf/openjdk7/dports/java/openjdk7/files/tests/UnlimitedJCETest.java (rev 0)
+++ users/landonf/openjdk7/dports/java/openjdk7/files/tests/UnlimitedJCETest.java 2013-12-15 17:24:39 UTC (rev 114796)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+import javax.crypto.Cipher;
+import java.security.NoSuchAlgorithmException;
+import java.util.Set;
+
+public class UnlimitedJCETest extends Base {
+ public static void main (String[] args) {
+ new UnlimitedJCETest().dispatch(args);
+ }
+
+ protected void run (Set<Variant> variants) {
+ int allowedKeyLength = 0;
+
+ try {
+ allowedKeyLength = Cipher.getMaxAllowedKeyLength("AES");
+ } catch (NoSuchAlgorithmException e) {
+ System.out.println("AES cipher not found");
+ System.exit(1);
+ }
+
+ if (variants.contains(Variant.limited_strength_jce)) {
+ if (allowedKeyLength > 128)
+ throw fail("The allowed key length for AES is too high: " + allowedKeyLength);
+ } else {
+ if (allowedKeyLength <= 128)
+ throw fail("The allowed key length for AES is too low: " + allowedKeyLength);
+ }
+
+ pass("The allowed key length for AES is " + allowedKeyLength);
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>