/hg/icedtea: Corrected JTreg harness - this tool now accepts "pr...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon May 16 07:47:47 PDT 2011
changeset 0bea9271a681 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0bea9271a681
author: ptisnovs
date: Mon May 16 16:52:29 2011 +0200
Corrected JTreg harness - this tool now accepts "process" flag for
"compile" tag.
diffstat:
ChangeLog | 12 +
test/jtreg/README | 4 +-
test/jtreg/com/sun/javatest/regtest/Action.java | 20 +
test/jtreg/com/sun/javatest/regtest/CompileAction.java | 200 +++++----
test/jtreg/com/sun/javatest/regtest/Path.java | 164 ++++++++
test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java | 2 +
6 files changed, 312 insertions(+), 90 deletions(-)
diffs (truncated from 804 to 500 lines):
diff -r 5ffa85bf891c -r 0bea9271a681 ChangeLog
--- a/ChangeLog Thu May 05 01:17:33 2011 +0100
+++ b/ChangeLog Mon May 16 16:52:29 2011 +0200
@@ -1,3 +1,15 @@
+2011-05-16 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * test/jtreg/README:
+ Updated.
+ * test/jtreg/com/sun/javatest/regtest/Path.java:
+ Added.
+ * test/jtreg/com/sun/javatest/regtest/Action.java:
+ * test/jtreg/com/sun/javatest/regtest/CompileAction.java:
+ * test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java:
+ Corrected JTreg harness - this tool now accepts "process" flag for
+ "compile" tag.
+
2011-05-04 Andrew John Hughes <ahughes at redhat.com>
* remove-intree-libraries.sh: Renamed.
diff -r 5ffa85bf891c -r 0bea9271a681 test/jtreg/README
--- a/test/jtreg/README Thu May 05 01:17:33 2011 +0100
+++ b/test/jtreg/README Mon May 16 16:52:29 2011 +0200
@@ -20,7 +20,9 @@
This version is based on:
- jtharness-oss-4_1_3a-dev
-- jtreg-4_0-src-b02-15_oct_2008
+- jtreg-4_0-src-b02-15_oct_2008 with change backported from
+ jtreg-4.1-src-b02_21_may_2010.zip. This change adds support for
+ option named "process" which can be used along with tag "compile".
IcedJTReg is distrubuted under the GPLv2.0, like jtreg and jtharness.
See the documents in the legal directory included in this release.
diff -r 5ffa85bf891c -r 0bea9271a681 test/jtreg/com/sun/javatest/regtest/Action.java
--- a/test/jtreg/com/sun/javatest/regtest/Action.java Thu May 05 01:17:33 2011 +0100
+++ b/test/jtreg/com/sun/javatest/regtest/Action.java Mon May 16 16:52:29 2011 +0200
@@ -300,6 +300,8 @@
section.setStatus(status);
} // endAction()
+ //----------workarounds-------------------------------------------------------
+
/**
* This method pushes the full, constructed command for the action to the
* log. The constructed command contains the the action and its arguments
@@ -425,6 +427,13 @@
EXEC_ERROR_CLEANUP = "Error while cleaning up threads after test",
CHECK_PASS = "Test description appears acceptable",
+ // used in: compile, main
+ SAMEVM_CANT_RESET_SECMGR= "Cannot reset security manager",
+ SAMEVM_CANT_RESET_PROPS = "Cannot reset system properties",
+
+ // used in:compile, main
+ AGENTVM_CANT_GET_VM = "Cannot get VM for test",
+
UNEXPECT_SYS_EXIT = "Unexpected exit from test",
CANT_FIND_SRC = "Can't file source file: ",
@@ -454,6 +463,8 @@
BUILD_UP_TO_DATE = "All files up to date",
BUILD_SUCC = "Build successful",
BUILD_LIB_LIST = " in directory-list: ",
+ BUILD_FUTURE_SOURCE = "WARNING: file %s has a modification time in the future: %s",
+ BUILD_FUTURE_SOURCE_2 = "Unexpected results may occur",
// clean
CLEAN_SUCC = "Clean successful",
@@ -478,6 +489,8 @@
COMPILE_PASS = "Compilation successful",
COMPILE_FAIL_EXPECT = "Compilation failed as expected",
COMPILE_FAIL = "Compilation failed",
+ COMPILE_CANT_RESET_SECMGR= "Cannot reset security manager",
+ COMPILE_CANT_RESET_PROPS = "Cannot reset system properties",
// ignore
IGNORE_UNEXPECT_OPTS = "Unexpected option(s) for `ignore'",
@@ -486,6 +499,11 @@
IGNORE_TEST_SUPPRESSED = "@ignore suppressed by command line option",
IGNORE_TEST_SUPPRESSED_C = "@ignore suppressed by command line option: ",
+ // junit
+ JUNIT_NO_DRIVER = "No JUnit 4 driver (install junit.jar next to jtreg.jar)",
+ JUNIT_NO_CLASSNAME = "No class provided for `junit'",
+ JUNIT_BAD_MAIN_ARG = "Bad argument provided for class in `junit'",
+
// main
MAIN_NO_CLASSNAME = "No class provided for `main'",
MAIN_MANUAL_NO_VAL = "Arguments to `manual' option not supported: ",
@@ -500,6 +518,8 @@
MAIN_UNEXPECT_VMOPT = ": vm option(s) found, need to specify /othervm",
MAIN_POLICY_WRITE_PROB= "Problems writing new policy file: ",
MAIN_POLICY_SM_PROB = "Unable to create new policy file: ",
+ MAIN_CANT_RESET_SECMGR= "Cannot reset security manager",
+ MAIN_CANT_RESET_PROPS = "Cannot reset system properties",
// runOtherJVM
MAIN_CANT_WRITE_ARGS = "Can't write `main' argument file",
diff -r 5ffa85bf891c -r 0bea9271a681 test/jtreg/com/sun/javatest/regtest/CompileAction.java
--- a/test/jtreg/com/sun/javatest/regtest/CompileAction.java Thu May 05 01:17:33 2011 +0100
+++ b/test/jtreg/com/sun/javatest/regtest/CompileAction.java Mon May 16 16:52:29 2011 +0200
@@ -37,6 +37,12 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import com.sun.javatest.Status;
import com.sun.javatest.TestResult;
@@ -68,7 +74,7 @@
init(opts, args, reason, script);
return run();
} // compile()
-
+
/**
* This method does initial processing of the options and arguments for the
* action. Processing is determined by the requirements of run() and
@@ -97,46 +103,48 @@
throws ParseException {
this.script = script;
this.reason = reason;
-
+
if (args.length == 0)
throw new ParseException(COMPILE_NO_CLASSNAME);
-
+
for (int i = 0; i < opts.length; i++) {
String optName = opts[i][0];
String optValue = opts[i][1];
-
+
if (optName.equals("fail")) {
reverseStatus = parseFail(optValue);
} else if (optName.equals("timeout")) {
timeout = parseTimeout(optValue);
} else if (optName.equals("ref")) {
ref = parseRef(optValue);
+ } else if (optName.equals("process")) {
+ process = true;
} else {
throw new ParseException(COMPILE_BAD_OPT + optName);
}
}
-
+
if (timeout < 0)
timeout = script.getActionTimeout(0);
-
+
// add absolute path name to all the .java files create appropriate
// class directories
try {
for (int i = 0; i < args.length; i++) {
String currArg = args[i];
-
+
if (currArg.endsWith(".java")) {
// make sure the correct file separator has been used
currArg = currArg.replace('/', File.separatorChar);
-
+
File sourceFile = new File(currArg);
if (!sourceFile.isAbsolute())
// User must have used @compile, so file must be
// in the same directory as the defining file.
- args[i] = script.absTestSrcDir() + FILESEP + currArg;
+ args[i] = new File(script.absTestSrcDir(), currArg).getPath();
// if (!sourceFile.exists())
// throw new ParseException(CANT_FIND_SRC);
-
+
// set the destination directory only if we've actually
// found something to compile
if (script.hasEnv()) {
@@ -144,65 +152,72 @@
if (!destDir.exists())
destDir.mkdirs();
}
-
+
}
-
+
if (currArg.equals("-classpath") || currArg.equals("-cp")) {
classpathp = true;
// assume the next element provides the classpath, add
// test.classes and test.src and lib-list to it
if (script.hasEnv()) {
- args[i+1] = addPath(args[i+1],
- script.absTestClsDir() + PATHSEP +
- script.absTestSrcDir() + PATHSEP +
- script.absClsLibListStr());
+ Path p = new Path(args[i+1])
+ .append(script.absTestClsDir())
+ .append(script.absTestSrcDir())
+ .append(script.absClsLibListStr());
+ args[i+1] = p.toString();
}
args[i+1] = singleQuoteString(args[i+1]);
}
-
+
if (currArg.equals("-d")) {
throw new ParseException(COMPILE_OPT_DISALLOW);
}
-
+
// note that -sourcepath is only valid for JDK1.2 and beyond
if (currArg.equals("-sourcepath")) {
sourcepathp = true;
// assume the next element provides the sourcepath, add test.src
// and lib-list to it
- args[i+1] = addPath(args[i+1],
- script.absTestSrcDir() + PATHSEP +
- script.absSrcLibListStr());
+ Path p = new Path(args[i+1])
+ .append(script.absTestSrcDir())
+ .append(script.absSrcLibListStr());
+ args[i+1] = p.toString();
args[i+1] = singleQuoteString(args[i+1]);
}
}
+
+ // If we didn't set the destination directory, then we must not have
+ // found something ending with ".java" to compile.
+ if (script.hasEnv() && destDir == null) {
+ if (process) {
+ destDir = script.absTestClsDir();
+ if (!destDir.exists())
+ destDir.mkdirs();
+ } else
+ throw new ParseException(COMPILE_NO_DOT_JAVA);
+ }
} catch (RegressionScript.TestClassException e) {
throw new ParseException(e.getMessage());
}
- // If we didn't set the destination directory, then we must not have
- // found something ending with ".java" to compile.
- if (script.hasEnv() && destDir == null) {
- throw new ParseException(COMPILE_NO_DOT_JAVA);
- }
-
this.args = args;
} // init()
-
+
@Override
public File[] getSourceFiles() {
List<File> l = new ArrayList<File>();
-
+
for (int i = 0; i < args.length; i++) {
String currArg = args[i];
-
+
if (currArg.endsWith(".java")) {
l.add(new File(currArg));
}
}
-
+
return l.toArray(new File[l.size()]);
}
-
+
/**
* The method that does the work of the action. The necessary work for the
* given action is defined by the tag specification.
@@ -227,9 +242,9 @@
*/
public Status run() throws TestRunException {
Status status;
-
+
section = startAction("compile", args, reason);
-
+
// Make sure that all of the .java files we want to compile exist.
// We could let the compiler handle this, but if we put the extra check
// here, we get more information in "check" mode.
@@ -240,7 +255,7 @@
throw new TestRunException(CANT_FIND_SRC + currArg);
}
}
-
+
if (script.isCheck()) {
status = Status.passed(CHECK_PASS);
} else {
@@ -249,71 +264,73 @@
else
status = runSameJVM();
}
-
+
endAction(status, section);
return status;
} // run()
-
+
//----------internal methods------------------------------------------------
-
+
private Status runOtherJVM() throws TestRunException {
Status status;
final boolean jdk11 = script.isJDK11();
final boolean useCLASSPATHEnv = jdk11;
final boolean useClassPathOpt = !jdk11;
final boolean useSourcePathOpt = !jdk11;
-
+
// CONSTRUCT THE COMMAND LINE
List<String> javacOpts = new ArrayList<String>();
-
+
// Why JavaTest?
+ Path cp = new Path(script.getJavaTestClassPath(), script.testClassPath());
if (useCLASSPATHEnv) {
- javacOpts.add("CLASSPATH=" + script.getJavaTestClassPath() + PATHSEP + script.testClassPath());
+ javacOpts.add("CLASSPATH=" + cp);
}
-
+
javacOpts.add(script.getJavacProg());
-
+
javacOpts.addAll(script.getTestToolVMOptions());
-
+
javacOpts.addAll(script.getTestCompilerOptions());
-
+
javacOpts.add("-d");
javacOpts.add(destDir.toString());
-
+
// JavaTest added, to match CLASSPATH, but not sure why JavaTest required at all
if (!classpathp && useClassPathOpt) {
javacOpts.add("-classpath");
- javacOpts.add(script.getJavaTestClassPath() + PATHSEP + script.testClassPath());
+ javacOpts.add(cp.toString());
}
-
+
if (!sourcepathp && useSourcePathOpt) {
javacOpts.add("-sourcepath");
javacOpts.add(script.testSourcePath());
}
-
+
+ // Set test.src and test.classes for the benefit of annotation processors
String[] envVars = script.getEnvVars();
String[] jcOpts = javacOpts.toArray(new String[javacOpts.size()]);
String[] cmdArgs = StringArray.append(envVars, jcOpts);
cmdArgs = StringArray.append(cmdArgs, args);
-
+
if (showCmd)
JTCmd("compile", cmdArgs, section);
-
+
// PASS TO PROCESSCOMMAND
StringWriter outSW = new StringWriter();
StringWriter errSW = new StringWriter();
try {
ProcessCommand cmd = new ProcessCommand();
cmd.setExecDir(script.absTestScratchDir());
-
+
if (timeout > 0)
script.setAlarm(timeout*1000);
-
+
status = cmd.run(cmdArgs, new PrintWriter(errSW), new PrintWriter(outSW));
} finally {
script.setAlarm(0);
}
-
+
// EVALUATE THE RESULTS
boolean ok = status.isPassed();
int st = status.getType();
@@ -330,7 +347,7 @@
sr = COMPILE_FAIL;
}
status = new Status(st, sr);
-
+
String outString = outSW.toString();
String errString = errSW.toString();
PrintWriter sysOut = section.createOutput("System.out");
@@ -338,11 +355,11 @@
try {
sysOut.write(outString);
sysErr.write(errString);
-
+
// COMPARE OUTPUT TO GOLDENFILE IF REQUIRED
// tag-spec says that "standard error is redirected to standard out
// so that /ref can be used." Simulate this by concatenating streams.
-
+
try {
if ((ref != null) && (status.getType() == Status.PASSED)) {
File refFile = new File(script.absTestSrcDir(), ref);
@@ -361,7 +378,7 @@
if (sysOut != null) sysOut.close();
if (sysErr != null) sysErr.close();
}
-
+
return status;
} // runOtherJVM()
@@ -370,86 +387,90 @@
// CONSTRUCT THE COMMAND LINE
List<String> javacOpts = new ArrayList<String>();
-
+
javacOpts.addAll(script.getTestCompilerOptions());
-
- javacOpts.add("-d");
- javacOpts.add(destDir.toString());
-
+
+ if (destDir != null) {
+ javacOpts.add("-d");
+ javacOpts.add(destDir.toString());
+ }
+
if (!classpathp) {
javacOpts.add("-classpath");
javacOpts.add(script.testClassPath());
}
-
+
if (!sourcepathp) { // must be JDK1.4 or greater, to even run JavaTest 3
javacOpts.add("-sourcepath");
javacOpts.add(script.testSourcePath());
}
-
+
String[] jcOpts = javacOpts.toArray(new String[javacOpts.size()]);
String[] cmdArgs = StringArray.append(jcOpts, args);
-
+
if (showCmd)
JTCmd("compile", cmdArgs, section);
// RUN THE COMPILER
+ // RUN THE COMPILER
+
// for direct use with JavaCompileCommand
StringWriter outSW = new StringWriter();
StringWriter errSW = new StringWriter();
PrintWriter outPW = new PrintWriter(outSW);
PrintWriter errPW = new PrintWriter(errSW);
-
+
// to catch sysout and syserr
ByteArrayOutputStream outOS = new ByteArrayOutputStream();
ByteArrayOutputStream errOS = new ByteArrayOutputStream();
PrintStream outPS = new PrintStream(outOS);
PrintStream errPS = new PrintStream(errOS);
-
+
PrintStream saveOut = System.out;
PrintStream saveErr = System.err;
-
+
try {
Status stat = redirectOutput(outPS, errPS);
if (!stat.isPassed())
return stat;
-
+
JavaCompileCommand jcc = new JavaCompileCommand();
if (timeout > 0)
script.setAlarm(timeout*1000);
-
+
status = jcc.run(cmdArgs, errPW, outPW);
} finally {
Status stat = redirectOutput(saveOut, saveErr);
if (!stat.isPassed())
return stat;
-
+
script.setAlarm(0);
}
More information about the distro-pkg-dev
mailing list