changeset in /hg/icedtea: Add missing (ignored) lib/ files. Add ...
Mark Wielaard
mark at klomp.org
Thu May 29 14:14:10 PDT 2008
changeset f42fc832db86 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f42fc832db86
description:
Add missing (ignored) lib/ files. Add test report and classes dirs to ignore.
2008-05-19 Mark Wielaard <mark at klomp.org>
* test/jtreg/com/sun/javatest/lib/*.java: Added.
* .hgignore: Add test/hotspot, test/jdk, test/langtools and
test/jtreg/classes
diffstat:
14 files changed, 2539 insertions(+)
.hgignore | 4
ChangeLog | 6
test/jtreg/com/sun/javatest/lib/APIScript.java | 114 ++
test/jtreg/com/sun/javatest/lib/Deprecated.java | 52 +
test/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java | 77 +
test/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java | 155 +++
test/jtreg/com/sun/javatest/lib/JavaCompileCommand.java | 317 +++++++
test/jtreg/com/sun/javatest/lib/KeywordScript.java | 235 +++++
test/jtreg/com/sun/javatest/lib/MultiStatus.java | 246 +++++
test/jtreg/com/sun/javatest/lib/MultiTest.java | 314 +++++++
test/jtreg/com/sun/javatest/lib/ProcessCommand.java | 462 +++++++++++
test/jtreg/com/sun/javatest/lib/ReportScript.java | 59 +
test/jtreg/com/sun/javatest/lib/StdTestScript.java | 223 +++++
test/jtreg/com/sun/javatest/lib/TestCases.java | 275 ++++++
diffs (truncated from 2604 to 500 lines):
diff -r bf4662205a02 -r f42fc832db86 .hgignore
--- a/.hgignore Mon May 19 08:16:22 2008 +0200
+++ b/.hgignore Mon May 19 10:33:03 2008 +0200
@@ -22,6 +22,10 @@ platform_zero
platform_zero
jvm.cfg
ergo.c
+test/hotspot
+test/jdk
+test/langtools
+test/jtreg/classes
rt/com/sun/jdi/AbsentInformationException.java
rt/com/sun/jdi/Accessible.java
rt/com/sun/jdi/ArrayReference.java
diff -r bf4662205a02 -r f42fc832db86 ChangeLog
--- a/ChangeLog Mon May 19 08:16:22 2008 +0200
+++ b/ChangeLog Mon May 19 10:33:03 2008 +0200
@@ -1,3 +1,9 @@ 2008-05-19 Mark Wielaard <mark at klomp.o
+2008-05-19 Mark Wielaard <mark at klomp.org>
+
+ * test/jtreg/com/sun/javatest/lib/*.java: Added.
+ * .hgignore: Add test/hotspot, test/jdk, test/langtools and
+ test/jtreg/classes
+
2008-05-19 Mark Wielaard <mark at klomp.org>
* test/jtreg/*: New jtreg and jtharness sources.
diff -r bf4662205a02 -r f42fc832db86 test/jtreg/com/sun/javatest/lib/APIScript.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jtreg/com/sun/javatest/lib/APIScript.java Mon May 19 10:33:03 2008 +0200
@@ -0,0 +1,114 @@
+/*
+ * $Id$
+ *
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.javatest.lib;
+
+import java.io.File;
+import java.io.PrintWriter;
+
+import com.sun.javatest.Script;
+import com.sun.javatest.Status;
+import com.sun.javatest.TestEnvironment;
+import com.sun.javatest.TestDescription;
+
+/**
+ * A Script designed to compile/execute a test.
+ */
+public class APIScript extends Script
+{
+ /// XXX this code really needs to be re-visited!
+
+ /**
+ * The method that interprets the tags provided in the test description and
+ * performs actions accordingly.
+ *
+ * @param args Any arguments that the APIScript may use. Currently
+ * there are none (value ignored).
+ * @param td The current TestDescription.
+ * @param env The test environment giving the details of how to run the
+ * test.
+ * @return The result of running the script on the given test
+ * description.
+ */
+ public Status run(String [] args, TestDescription td, TestEnvironment env) {
+
+ PrintWriter trOut = getTestResult().getTestCommentWriter();
+
+ Status status = decodeArgs(args);
+ if (status != null)
+ return status;
+
+ // XXX This isn't everything. We need to make sure that this is a
+ // XXX reasonable subset of JCKScript. Do we want to handle all options
+ // XXX available there? How about the keywords?
+
+ // compile
+ File [] srcs = td.getSourceFiles();
+ Status compileStatus;
+ if (precompileClassDir == null) {
+ trOut.println("Unconditionally compiling all sources");
+ compileStatus = compileTogether(TEST_COMPILE, srcs);
+ } else {
+ trOut.println("Compiling sources only if necessary");
+ compileStatus = compileIfNecessary(TEST_COMPILE, srcs, precompileClassDir);
+ }
+
+ if (!compileStatus.isPassed())
+ return compileStatus;
+
+ // execute
+ String executeClass = td.getParameter("executeClass");
+ String executeArgs = td.getParameter("executeArgs");
+ Status executeStatus = execute(TEST_EXECUTE, executeClass, executeArgs);
+
+ return executeStatus;
+ } // run()
+
+ //----------private methods-------------------------------------------------
+
+ private Status decodeArgs(String [] args) {
+ // decode args
+ for (int i = 0; i < args.length; i++) {
+ if (args[i].equals("-precompileClassDir") && (i+1 < args.length))
+ precompileClassDir = args[++i];
+ else
+ return Status.failed(UNRECOGNIZED_ARG + args[i]);
+ }
+
+ return null;
+ } // init()
+
+ //----------member variables------------------------------------------------
+
+ private static final String TEST_COMPILE = "testCompile";
+ private static final String TEST_EXECUTE = "testExecute";
+
+ // special option to use compileIfNecessary
+ private String precompileClassDir;
+
+ private static final String
+ UNRECOGNIZED_ARG = "Unrecognized argument for script: ";
+}
diff -r bf4662205a02 -r f42fc832db86 test/jtreg/com/sun/javatest/lib/Deprecated.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jtreg/com/sun/javatest/lib/Deprecated.java Mon May 19 10:33:03 2008 +0200
@@ -0,0 +1,52 @@
+/*
+ * $Id$
+ *
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.javatest.lib;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+
+/**
+ * This class should take the hit for all deprecated methods used in this
+ * package.
+ */
+class Deprecated
+{
+ /**
+ * This method is for use in place of calls to the deprecated constructors
+ * for PrintStream(). It is necessary to keep using PrintStreams for
+ * java.lang.System.setOut(), java.lang.System.setErr(), or calls to things
+ * in sun.tools that have no alternative entry points that do not use
+ * PrintStreams.
+ *
+ * @param out The output stream to which values and objects will be
+ * printed.
+ * @return A PrintStream.
+ */
+ static PrintStream createPrintStream(OutputStream out) {
+ return new PrintStream(out);
+ }
+}
diff -r bf4662205a02 -r f42fc832db86 test/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jtreg/com/sun/javatest/lib/ExecStdTestOtherJVMCmd.java Mon May 19 10:33:03 2008 +0200
@@ -0,0 +1,77 @@
+/*
+ * $Id$
+ *
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.javatest.lib;
+
+import com.sun.javatest.Status;
+
+/**
+ * This is a modification of <code>ProcessCommand</code> suitable
+ * for executing standard tests in a separate JVM. When run in a
+ * separate process, these tests report their exit status by calling
+ * <code>Status.exit()</code>.
+ **/
+public class ExecStdTestOtherJVMCmd extends ProcessCommand
+{
+
+ /**
+ * Generate a status for the command, based upon the command's exit code
+ * and a status that may have been passed from the command by using
+ * <code>status.exit()</code>.
+ *
+ * @param exitCode The exit code from the command that was executed.
+ * @param logStatus If the command that was executed was a test program
+ * and exited by calling <code>status.exit()</code>,
+ * then logStatus will be set to `status'. Otherwise,
+ * it will be null. The value of the status is passed
+ * from the command by writing it as the last line to
+ * stdout before exiting the process. If it is not
+ * received as the last line, the value will be lost.
+ * @return If <code>logStatus</code> is not null, it will
+ * be used as the result; this will normally correspond
+ * to the status for which the test called
+ * <code>status.exit();</code>.
+ * <p> If <code>logStatus</code> is null, that means
+ * that for some reason the test did not successfully
+ * call <code>status.exit()</code> and the test is
+ * deemed to have failed. If the exit code is zero,
+ * a likely possibility is that the test raised an
+ * exception which caused the JVM to dump the stack
+ * and exit. In this case, the result is
+ * <code>Status.failed("exit without status, exception assumed")</code>.
+ * In other cases, the result is simply
+ * <code>Status.failed("exit code" + exitCode)</code>.
+ *
+ **/
+ protected Status getStatus(int exitCode, Status logStatus) {
+ if (logStatus != null)
+ return logStatus;
+ else if (exitCode == 0)
+ return Status.failed("exit without status, exception assumed");
+ else
+ return Status.failed("exit code " + exitCode);
+ }
+}
diff -r bf4662205a02 -r f42fc832db86 test/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jtreg/com/sun/javatest/lib/ExecStdTestSameJVMCmd.java Mon May 19 10:33:03 2008 +0200
@@ -0,0 +1,155 @@
+/*
+ * $Id$
+ *
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.javatest.lib;
+
+import java.io.File;
+import java.io.PrintWriter;
+import com.sun.javatest.Command;
+import com.sun.javatest.Status;
+import com.sun.javatest.Test;
+import com.sun.javatest.util.DirectoryClassLoader;
+
+
+/**
+ * ExecStdTestSameJVMCmd executes a standard test (one that implements
+ * the Test interface) in the same Java Virtual Machine as the caller.
+ *
+ * It can use either a private class loader or the system class loader.
+ * A private class loader will be created if the -loadDir option is given;
+ * otherwise the system class loader will be used. A private class
+ * loader minimises the interference between tests, but you may be
+ * restricted from using private class loaders if you are running the
+ * harness inside a web browser.
+ *
+ * <p> If the the <code>-repeat</code> option is provided, then the test will be
+ * run multiple times in the same JVM. <code>Status.error()</code> will be
+ * returned (and the remainder of the iterations will not be performed) if any
+ * repetition of the test returns an error, or if the status return type changes
+ * between iterations. The returned status after each iteration will be
+ * included in the log. If this option is not given, the test will be run once.
+ *
+ * @see com.sun.javatest.lib.ExecStdTestOtherJVMCmd
+ */
+public class ExecStdTestSameJVMCmd extends Command
+{
+ /**
+ * The method that that does the work of the command.
+ * @param args [-loadDir <em>dir</em>] [-saveProps] <em>executeClass</em> <em>executeArgs</em>
+ * @param log A stream to which to report messages and errors
+ * @param ref A stream to which to write reference output
+ * @return The result of the command
+ */
+ public Status run(String[] args, PrintWriter log, PrintWriter ref) {
+ int repeat = 1;
+ String className = null;
+ String[] executeArgs = { };
+ ClassLoader loader = getClassLoader();
+
+ int i = 0;
+
+ for (; i < args.length && args[i].startsWith("-"); i++) {
+ if ("-loadDir".equals(args[i]) && i+1 < args.length) {
+ // -loadDir is optional; if given, a new class loader will be created
+ // to load the class to execute; if not given, the system class loader
+ // will be used.
+ loader = new DirectoryClassLoader(new File(args[++i]));
+ } else if ("-repeat".equals(args[i]) && i+1 < args.length) {
+ // -repeat is optional; if given, the test will be run that
+ // number of times (in the same JVM)
+ try {
+ if ((repeat = Integer.parseInt(args[++i])) < 1)
+ return Status.error("Unexpected number of repetitions: " + repeat);
+ }
+ catch (NumberFormatException e) {
+ return Status.error("Unrecognized number of repetitions: " + repeat);
+ }
+ }
+ }
+
+ // Next must come the executeClass
+ if (i < args.length) {
+ className = args[i];
+ i++;
+ } else
+ return Status.failed("No executeClass specified");
+
+ // Finally, any optional args
+ if (i < args.length) {
+ executeArgs = new String[args.length - i];
+ System.arraycopy(args, i, executeArgs, 0, executeArgs.length);
+ }
+
+ Status status = null;
+ try {
+ Class c;
+ if (loader == null)
+ c = Class.forName(className);
+ else
+ c = loader.loadClass(className);
+
+ Status prevStatus = null;
+ for (int j = 0; j < repeat; j++) {
+ if (repeat > 1)
+ log.println("iteration: " + (j+1));
+
+ Test t = (Test) (c.newInstance());
+ status = t.run(executeArgs, log, ref);
+
+ if (repeat > 1)
+ log.println(" " + status);
+
+ if ((prevStatus != null) && status.getType() != prevStatus.getType())
+ status = Status.error("Return status type changed at repetition: " + (j+1));
+
+ if (status.isError())
+ return status;
+ else
+ prevStatus = status;
+ }
+ }
+ catch (ClassCastException e) {
+ status = Status.failed("Can't load test: required interface not found");
+ }
+ catch (ClassNotFoundException e) {
+ status = Status.failed("Can't load test: " + e);
+ }
+ catch (InstantiationException e) {
+ status = Status.failed("Can't instantiate test: " + e);
+ }
+ catch (IllegalAccessException e) {
+ status = Status.failed("Illegal access to test: " + e);
+ }
+ catch (VerifyError e) {
+ return Status.failed("Class verification error while trying to load test class `" + className + "': " + e);
+ }
+ catch (LinkageError e) {
+ return Status.failed("Class linking error while trying to load test class `" + className + "': " + e);
+ }
+ return status;
+ }
+}
+
diff -r bf4662205a02 -r f42fc832db86 test/jtreg/com/sun/javatest/lib/JavaCompileCommand.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jtreg/com/sun/javatest/lib/JavaCompileCommand.java Mon May 19 10:33:03 2008 +0200
@@ -0,0 +1,317 @@
+/*
+ * $Id$
+ *
+ * Copyright 1996-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package com.sun.javatest.lib;
+
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.InvocationTargetException;
+import com.sun.javatest.Command;
+import com.sun.javatest.Status;
+import com.sun.javatest.util.PathClassLoader;
+import com.sun.javatest.util.WriterStream;
+
+/**
+ * Invoke a Java compiler via reflection.
+ * The compiler is assumed to have a constructor and compile method
+ * matching the following signature:
+ *<pre>
+ * public class COMPILER {
+ * public COMPILER(java.io.OutputStream out, String compilerName);
+ * public boolean compile(String[] args);
+ * }
+ *</pre>
+ * or
+ *<pre>
+ * public class COMPILER {
+ * public COMPILER();
+ * public int compile(String[] args);
+ * }
More information about the distro-pkg-dev
mailing list