[Git][java-team/jtreg][upstream] New upstream version 5.0-b01
Emmanuel Bourg
gitlab at salsa.debian.org
Sun Apr 5 09:49:37 BST 2020
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / jtreg
Commits:
4483932a by Emmanuel Bourg at 2020-03-21T00:40:50+01:00
New upstream version 5.0-b01
- - - - -
28 changed files:
- .hg_archival.txt
- .hgtags
- make/Defs.gmk
- make/build-all.sh
- make/build.properties
- make/build.xml
- src/share/classes/com/sun/javatest/regtest/config/Locations.java
- src/share/classes/com/sun/javatest/regtest/config/RegressionEnvironment.java
- src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
- src/share/classes/com/sun/javatest/regtest/exec/ShellAction.java
- src/share/classes/com/sun/javatest/regtest/tool/Tool.java
- src/share/doc/javatest/regtest/tag-spec.html
- test/rerun/std/AppletTest.agentvm.out
- test/rerun/std/AppletTest.othervm.out
- test/rerun/std/BuildTest.agentvm.out
- test/rerun/std/BuildTest.othervm.out
- test/rerun/std/CompileTest.agentvm.out
- test/rerun/std/CompileTest.othervm.out
- test/rerun/std/JUnitTest.agentvm.out
- test/rerun/std/JUnitTest.othervm.out
- test/rerun/std/MainTest.agentvm.out
- test/rerun/std/MainTest.othervm.out
- test/rerun/std/ShellTest.agentvm.out
- test/rerun/std/ShellTest.othervm.out
- test/rerun/std/TestNGTest.agentvm.out
- test/rerun/std/TestNGTest.othervm.out
- test/rerun/testng/TestNGTest.agentvm.out
- test/rerun/testng/TestNGTest.othervm.out
Changes:
=====================================
.hg_archival.txt
=====================================
@@ -1,4 +1,4 @@
repo: 9f51ef22f00a3d5b681472cacf3ce15868073103
-node: deee95d5d8ff6406b77c0d5b9297736eb7c98c6d
+node: 03c4dff80b0f55865c6e5fe0aa8ea94d0ca1a2ac
branch: default
-tag: jtreg4.2-b16
+tag: jtreg5.0-b01
=====================================
.hgtags
=====================================
@@ -28,3 +28,5 @@ a13ec77e7adcc4c9ed434e664abc350abaacc045 jtreg4.2-b11
652902f7fb0ed0b4f307d61a799caf50a6e609be jtreg4.2-b12
7a38f21e077821a5015792e85b3793c90c81b866 jtreg4.2-b13
ec37d2900cd42987270f98423a60eb6297bdc37b jtreg4.2-b14
+d5a9216fad5ca01002e18526be2c31cafb43e178 jtreg4.2-b15
+deee95d5d8ff6406b77c0d5b9297736eb7c98c6d jtreg4.2-b16
=====================================
make/Defs.gmk
=====================================
@@ -122,7 +122,7 @@ endif
JDK9HOME := $(call FullPath,$(JDK9HOME))
# The JDK used to build jtreg and to run most tests.
-# It should be set to JDK 7 or later.
+# It should be set to JDK 8 or later.
# If not set, it defaults to $(JDK18HOME), or to $(J2SEHOME) for backwards
# compatibility
@@ -141,20 +141,20 @@ JDKJAVA = $(JDKHOME)/bin/java
JDKJAVAC = $(JDKHOME)/bin/javac
JAR = $(JDKHOME)/bin/jar
-# Only use -source -target, to support legacy platforms, when building with JDK 7 or 8
+# Only use -source -target, to support legacy platforms, when building with JDK 8
# Otherwise, use default values for $JDKHOME/bin/javac
-SUPPORT_OLD_SOURCE_TARGET = $(shell $(JDKJAVAC) -version 2>&1 | grep '[78]' > /dev/null && echo true )
+SUPPORT_OLD_SOURCE_TARGET = $(shell $(JDKJAVAC) -version 2>&1 | grep '[8]' > /dev/null && echo true )
ifneq ($(SUPPORT_OLD_SOURCE_TARGET),)
OLD_JAVAC_SOURCE_TARGET = -source 1.2 -target 1.1
AGENT_JAVAC_SOURCE_TARGET = -source 5 -target 5
- TOOL_JAVAC_SOURCE_TARGET = -source 7 -target 7
+ TOOL_JAVAC_SOURCE_TARGET = -source 8 -target 8
endif
ifdef JDK15HOME
JDK15_BOOTCLASSPATH = -bootclasspath $(JDK15HOME)/jre/lib/rt.jar
endif
-ifdef JDK17HOME
- JDK17_BOOTCLASSPATH = -bootclasspath $(JDK17HOME)/jre/lib/rt.jar
+ifdef JDK18HOME
+ JDK18_BOOTCLASSPATH = -bootclasspath $(JDK18HOME)/jre/lib/rt.jar
endif
# for files needed to run othervm tests on oldest supported platforms
@@ -170,7 +170,7 @@ REGTEST_AGENT_JAVAC_OPTIONS = \
# for files needed for jtreg tool
REGTEST_TOOL_JAVAC = $(JDKHOME)/bin/javac
REGTEST_TOOL_JAVAC_OPTIONS = \
- $(TOOL_JAVAC_SOURCE_TARGET) $(JDK17_BOOTCLASSPATH) -Xlint:all,-options -Werror
+ $(TOOL_JAVAC_SOURCE_TARGET) $(JDK18_BOOTCLASSPATH) -Xlint:all,-options -Werror
#----- JavaHelp
#
@@ -465,7 +465,7 @@ IMAGESRC_SRCDIR = $(IMAGESRC_TOPDIR)/src/share/classes
# Version tags
#
# BUILD_* variables are normally set (overridden) by RE builds
-BUILD_VERSION = 4.2
+BUILD_VERSION = 5.0
BUILD_MILESTONE = dev
BUILD_NUMBER = b00
=====================================
make/build-all.sh
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
#
-# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020, Oracle and/or its affiliates. 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
@@ -53,11 +53,11 @@ fi
case `uname` in CYGWIN*) CYGWIN=1 ;; *) CYGWIN=0 ;; esac
native_path() {
- if [ $CYGWIN == 1 ]; then echo `cygpath -w $1`; else echo $1; fi
+ if [ $CYGWIN -eq 1 ]; then echo `cygpath -w $1`; else echo $1; fi
}
mixed_path() {
- if [ $CYGWIN == 1 ]; then echo `cygpath -m $1`; else echo $1; fi
+ if [ $CYGWIN -eq 1 ]; then echo `cygpath -m $1`; else echo $1; fi
}
get_scm_type() {
@@ -135,7 +135,7 @@ MAVEN_REPO_URL=https://repo1.maven.org/maven2
CODE_TOOLS_URL=http://hg.openjdk.java.net/code-tools
# The following are Mercurial tags for the corresponding OpenJDK Code Tools repo
ASMTOOLS_VERSION=${ASMTOOLS_VERSION:-7.0-b06} # early access for 7.0
-JTHARNESS_VERSION=${JTHARNESS_VERSION:-jt6.0-b04} # early access for 6.0
+JTHARNESS_VERSION=${JTHARNESS_VERSION:-jt6.0-b08} # early access for 6.0
JCOV_VERSION=${JCOV_VERSION:-jcov3.0-b05} # jcov3.0, ASM 6.2
# ANT
=====================================
make/build.properties
=====================================
@@ -28,8 +28,8 @@
jtreg.build.resources = /opt
-# JTHarness or JavaTest (should be should be 4.6 or better)
-javatest.home = ${jtreg.build.resources}/jtharness/4.6
+# JTHarness or JavaTest (should be should be 6.0 or better)
+javatest.home = ${jtreg.build.resources}/jtharness/6.0
javatest.jar = ${javatest.home}/lib/javatest.jar
# the following is only true for older versions of JavaTest.
# can't use <available> to set it automatically for some reason
@@ -65,6 +65,6 @@ ant.jar = ${ant.home}/lib/ant.jar
# checkstyle (should be version 5.4 or better)
checkstyle.home = ${jtreg.build.resources}/checkstyle/5.4
-build.version = 4.2
+build.version = 5.0
build.milestone = dev
build.number = b00
=====================================
make/build.xml
=====================================
@@ -172,7 +172,7 @@
<target name="-compile-jtreg.classes">
<mkdir dir="${build.classes.dir}"/>
- <javac encoding="iso-8859-1" source="1.7" target="1.7"
+ <javac encoding="iso-8859-1" source="1.8" target="1.8"
debug="true" debuglevel="source,lines"
srcdir="${src.classes.dir}"
destdir="${build.classes.dir}"
=====================================
src/share/classes/com/sun/javatest/regtest/config/Locations.java
=====================================
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. 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
@@ -142,6 +142,7 @@ public class Locations {
private final SearchPath jtpath;
private final JDK testJDK;
+ private final File absTestFile;
private final File absBaseSrcDir;
private final File absTestSrcDir;
private final File absBaseClsDir;
@@ -163,6 +164,7 @@ public class Locations {
boolean useUniqueClassDir = (v.version != null)
&& (v.compareTo(new Version("4.2 b08")) >= 0);
+ absTestFile = td.getFile().getAbsoluteFile();
File relTestFile = td.getRootRelativeFile();
String relTestDir = relTestFile.getParent();
if (relTestDir == null)
@@ -357,6 +359,14 @@ public class Locations {
return (systemModules != null) && systemModules.contains(name);
}
+ /**
+ * Gets the path of the test defining file.
+ * @return the path
+ */
+ public File absTestFile() {
+ return absTestFile;
+ }
+
/**
* Gets the path of the test source directory.
* @return the path
=====================================
src/share/classes/com/sun/javatest/regtest/config/RegressionEnvironment.java
=====================================
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. 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
@@ -25,6 +25,7 @@
package com.sun.javatest.regtest.config;
+import java.util.ArrayList;
import java.util.Map;
import com.sun.javatest.TestEnvironment;
@@ -32,7 +33,7 @@ import com.sun.javatest.TestEnvironment;
public class RegressionEnvironment extends TestEnvironment
{
RegressionEnvironment(RegressionParameters params) throws Fault {
- super("regtest", new Map<?, ?>[] { }, new String[] { });
+ super("regtest", new ArrayList<Map<String, String>>(), new String[] { });
this.params = params;
}
=====================================
src/share/classes/com/sun/javatest/regtest/exec/RegressionScript.java
=====================================
@@ -449,7 +449,12 @@ public class RegressionScript extends Script {
throws Expr.Fault, ParseException {
Matcher m = namePattern.matcher(arg);
StringBuffer sb = null;
- while (m.find()) {
+ // Note that '\' may appear in the replacement value for paths on Windows,
+ // and so, in the following loop, avoid using Matcher::appendReplacement,
+ // which interprets '\' and `$' in the replacement string.
+ // Instead, use explicit operations to append the literal replacement value.
+ int pos = 0;
+ while (m.find(pos)) {
if (sb == null) {
sb = new StringBuffer();
}
@@ -458,12 +463,14 @@ public class RegressionScript extends Script {
if ("null".equals(value)) {
throw new ParseException("unset property " + name);
}
- m.appendReplacement(sb, value);
+ sb.append(arg.substring(pos, m.start()));
+ sb.append(value);
+ pos = m.end();
}
if (sb == null) {
return arg;
} else {
- m.appendTail(sb);
+ sb.append(arg.substring(pos));
return sb.toString();
}
}
@@ -1099,6 +1106,7 @@ public class RegressionScript extends Script {
.append(locations.absLibSrcJarList());
p.put("test.class.path.prefix", path.toString());
}
+ p.put("test.file", locations.absTestFile().getPath());
p.put("test.src", locations.absTestSrcDir().getPath());
p.put("test.src.path", toString(locations.absTestSrcPath()));
p.put("test.classes", locations.absTestClsDir().getPath());
=====================================
src/share/classes/com/sun/javatest/regtest/exec/ShellAction.java
=====================================
@@ -207,6 +207,7 @@ public class ShellAction extends Action
Map<String, String> env = new LinkedHashMap<>();
env.putAll(getEnvVars(true));
Locations locations = script.locations;
+ env.put("TESTFILE", fixupSep(locations.absTestFile()));
env.put("TESTSRC", fixupSep(locations.absTestSrcDir()));
env.put("TESTSRCPATH", fixupSep(locations.absTestSrcPath()));
env.put("TESTCLASSES" , fixupSep(locations.absTestClsDir()));
=====================================
src/share/classes/com/sun/javatest/regtest/tool/Tool.java
=====================================
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. 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
@@ -2205,12 +2205,12 @@ public class Tool {
/**
* Returns whether or not Cygwin may be available, by examining
- * to see if "LETTER:\cygwin" is mentioned anywhere in the PATH.
+ * to see if "LETTER:STUFF\cygwin" is mentioned anywhere in the PATH.
*/
private boolean isCygwinDetected() {
if (isWindows()) {
String PATH = System.getenv("PATH");
- return (PATH != null) && PATH.matches("(?i).*;[a-z]:\\\\cygwin.*");
+ return (PATH != null) && PATH.matches("(?i).*;[a-z]:[^;]*\\\\cygwin.*");
} else {
return false;
}
=====================================
src/share/doc/javatest/regtest/tag-spec.html
=====================================
@@ -1233,6 +1233,11 @@ action tag.
<caption>Test-specific system properties and environment variables</caption>
<thead><tr class="head"><th>System property<th>Environment variable<th>Notes</thead>
<tbody>
+<tr>
+<td><code>test.file</code>
+<td><code>TESTFILE</code>
+<td>The defining file of the test
+
<tr>
<td><code>test.src</code>
<td><code>TESTSRC</code>
=====================================
test/rerun/std/AppletTest.agentvm.out
=====================================
@@ -10,6 +10,7 @@ TZ=GMT+0.00 \
-J-Dmy.vm.option=x \
-J-Dmy.java.option=x \
-J-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/AppletTest.d:%WS%/test/rerun/std \
+ -J-Dtest.file=%WS%/test/rerun/std/AppletTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/AppletTest.d \
@@ -41,6 +42,7 @@ TZ=GMT+0.00 \
-Dmy.vm.option=x \
-Dmy.java.option=x \
-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/AppletTest.d:%WS%/test/rerun/std \
+ -Dtest.file=%WS%/test/rerun/std/AppletTest.java \
-Dtest.src=%WS%/test/rerun/std \
-Dtest.src.path=%WS%/test/rerun/std \
-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/AppletTest.d \
=====================================
test/rerun/std/AppletTest.othervm.out
=====================================
@@ -8,6 +8,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/javac \
-J-Dmy.vm.option=x \
+ -J-Dtest.file=%WS%/test/rerun/std/AppletTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/AppletTest.d \
@@ -38,6 +39,7 @@ TZ=GMT+0.00 \
-classpath %BUILD%/RerunTest.othervm/work/classes/std/AppletTest.d:%WS%/test/rerun/std:%JDKHOME%/lib/tools.jar:%BUILD%/images/jtreg/lib/javatest.jar:%BUILD%/images/jtreg/lib/jtreg.jar \
-Dmy.vm.option=x \
-Dmy.java.option=x \
+ -Dtest.file=%WS%/test/rerun/std/AppletTest.java \
-Dtest.src=%WS%/test/rerun/std \
-Dtest.src.path=%WS%/test/rerun/std \
-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/AppletTest.d \
=====================================
test/rerun/std/BuildTest.agentvm.out
=====================================
@@ -14,6 +14,7 @@ TZ=GMT+0.00 \
-J-Dmy.vm.option=x \
-J-Dmy.java.option=x \
-J-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/BuildTest.d:%WS%/test/rerun/std \
+ -J-Dtest.file=%WS%/test/rerun/std/BuildTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/BuildTest.d \
=====================================
test/rerun/std/BuildTest.othervm.out
=====================================
@@ -12,6 +12,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/javac \
-J-Dmy.vm.option=x \
+ -J-Dtest.file=%WS%/test/rerun/std/BuildTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/BuildTest.d \
=====================================
test/rerun/std/CompileTest.agentvm.out
=====================================
@@ -10,6 +10,7 @@ TZ=GMT+0.00 \
-J-Dmy.vm.option=x \
-J-Dmy.java.option=x \
-J-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/CompileTest.d:%WS%/test/rerun/std \
+ -J-Dtest.file=%WS%/test/rerun/std/CompileTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/CompileTest.d \
=====================================
test/rerun/std/CompileTest.othervm.out
=====================================
@@ -8,6 +8,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/javac \
-J-Dmy.vm.option=x \
+ -J-Dtest.file=%WS%/test/rerun/std/CompileTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/CompileTest.d \
=====================================
test/rerun/std/JUnitTest.agentvm.out
=====================================
@@ -10,6 +10,7 @@ TZ=GMT+0.00 \
-J-Dmy.vm.option=x \
-J-Dmy.java.option=x \
-J-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/JUnitTest.d:%WS%/test/rerun/std \
+ -J-Dtest.file=%WS%/test/rerun/std/JUnitTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/JUnitTest.d \
@@ -38,6 +39,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/java \
-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/JUnitTest.d:%WS%/test/rerun/std \
+ -Dtest.file=%WS%/test/rerun/std/JUnitTest.java \
-Dtest.src=%WS%/test/rerun/std \
-Dtest.src.path=%WS%/test/rerun/std \
-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/JUnitTest.d \
=====================================
test/rerun/std/JUnitTest.othervm.out
=====================================
@@ -8,6 +8,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/javac \
-J-Dmy.vm.option=x \
+ -J-Dtest.file=%WS%/test/rerun/std/JUnitTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/JUnitTest.d \
@@ -36,6 +37,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
CLASSPATH=%BUILD%/RerunTest.othervm/work/classes/std/JUnitTest.d:%WS%/test/rerun/std:%BUILD%/images/jtreg/lib/junit.jar:%JDKHOME%/lib/tools.jar:%BUILD%/images/jtreg/lib/javatest.jar:%BUILD%/images/jtreg/lib/jtreg.jar \
%JDKHOME%/bin/java \
+ -Dtest.file=%WS%/test/rerun/std/JUnitTest.java \
-Dtest.src=%WS%/test/rerun/std \
-Dtest.src.path=%WS%/test/rerun/std \
-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/JUnitTest.d \
=====================================
test/rerun/std/MainTest.agentvm.out
=====================================
@@ -10,6 +10,7 @@ TZ=GMT+0.00 \
-J-Dmy.vm.option=x \
-J-Dmy.java.option=x \
-J-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/MainTest.d:%WS%/test/rerun/std \
+ -J-Dtest.file=%WS%/test/rerun/std/MainTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/MainTest.d \
@@ -38,6 +39,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/java \
-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/MainTest.d:%WS%/test/rerun/std \
+ -Dtest.file=%WS%/test/rerun/std/MainTest.java \
-Dtest.src=%WS%/test/rerun/std \
-Dtest.src.path=%WS%/test/rerun/std \
-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/MainTest.d \
=====================================
test/rerun/std/MainTest.othervm.out
=====================================
@@ -8,6 +8,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/javac \
-J-Dmy.vm.option=x \
+ -J-Dtest.file=%WS%/test/rerun/std/MainTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/MainTest.d \
@@ -36,6 +37,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
CLASSPATH=%BUILD%/RerunTest.othervm/work/classes/std/MainTest.d:%WS%/test/rerun/std:%JDKHOME%/lib/tools.jar:%BUILD%/images/jtreg/lib/javatest.jar:%BUILD%/images/jtreg/lib/jtreg.jar \
%JDKHOME%/bin/java \
+ -Dtest.file=%WS%/test/rerun/std/MainTest.java \
-Dtest.src=%WS%/test/rerun/std \
-Dtest.src.path=%WS%/test/rerun/std \
-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/MainTest.d \
=====================================
test/rerun/std/ShellTest.agentvm.out
=====================================
@@ -6,6 +6,7 @@ LANG=en_US.UTF-8 \
MY_ENV_VAR=x \
PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
+TESTFILE=%WS%/test/rerun/std/ShellTest.sh \
TESTSRC=%WS%/test/rerun/std \
TESTSRCPATH=%WS%/test/rerun/std \
TESTCLASSES=%BUILD%/RerunTest.agentvm/work/classes/std/ShellTest.d \
=====================================
test/rerun/std/ShellTest.othervm.out
=====================================
@@ -6,6 +6,7 @@ LANG=en_US.UTF-8 \
MY_ENV_VAR=x \
PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
+TESTFILE=%WS%/test/rerun/std/ShellTest.sh \
TESTSRC=%WS%/test/rerun/std \
TESTSRCPATH=%WS%/test/rerun/std \
TESTCLASSES=%BUILD%/RerunTest.othervm/work/classes/std/ShellTest.d \
=====================================
test/rerun/std/TestNGTest.agentvm.out
=====================================
@@ -10,6 +10,7 @@ TZ=GMT+0.00 \
-J-Dmy.vm.option=x \
-J-Dmy.java.option=x \
-J-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/TestNGTest.d:%WS%/test/rerun/std \
+ -J-Dtest.file=%WS%/test/rerun/std/TestNGTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/TestNGTest.d \
@@ -38,6 +39,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/java \
-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/std/TestNGTest.d:%WS%/test/rerun/std \
+ -Dtest.file=%WS%/test/rerun/std/TestNGTest.java \
-Dtest.src=%WS%/test/rerun/std \
-Dtest.src.path=%WS%/test/rerun/std \
-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/std/TestNGTest.d \
=====================================
test/rerun/std/TestNGTest.othervm.out
=====================================
@@ -8,6 +8,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/javac \
-J-Dmy.vm.option=x \
+ -J-Dtest.file=%WS%/test/rerun/std/TestNGTest.java \
-J-Dtest.src=%WS%/test/rerun/std \
-J-Dtest.src.path=%WS%/test/rerun/std \
-J-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/TestNGTest.d \
@@ -36,6 +37,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
CLASSPATH=%BUILD%/RerunTest.othervm/work/classes/std/TestNGTest.d:%WS%/test/rerun/std:%BUILD%/images/jtreg/lib/testng.jar:%JDKHOME%/lib/tools.jar:%BUILD%/images/jtreg/lib/javatest.jar:%BUILD%/images/jtreg/lib/jtreg.jar \
%JDKHOME%/bin/java \
+ -Dtest.file=%WS%/test/rerun/std/TestNGTest.java \
-Dtest.src=%WS%/test/rerun/std \
-Dtest.src.path=%WS%/test/rerun/std \
-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/std/TestNGTest.d \
=====================================
test/rerun/testng/TestNGTest.agentvm.out
=====================================
@@ -10,6 +10,7 @@ TZ=GMT+0.00 \
-J-Dmy.vm.option=x \
-J-Dmy.java.option=x \
-J-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/testng:%WS%/test/rerun/testng \
+ -J-Dtest.file=%WS%/test/rerun/testng/TestNGTest.java \
-J-Dtest.src=%WS%/test/rerun/testng \
-J-Dtest.src.path=%WS%/test/rerun/testng \
-J-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/testng \
@@ -39,6 +40,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/java \
-Dtest.class.path.prefix=%BUILD%/RerunTest.agentvm/work/classes/testng:%WS%/test/rerun/testng \
+ -Dtest.file=%WS%/test/rerun/testng/TestNGTest.java \
-Dtest.src=%WS%/test/rerun/testng \
-Dtest.src.path=%WS%/test/rerun/testng \
-Dtest.classes=%BUILD%/RerunTest.agentvm/work/classes/testng \
=====================================
test/rerun/testng/TestNGTest.othervm.out
=====================================
@@ -8,6 +8,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
%JDKHOME%/bin/javac \
-J-Dmy.vm.option=x \
+ -J-Dtest.file=%WS%/test/rerun/testng/TestNGTest.java \
-J-Dtest.src=%WS%/test/rerun/testng \
-J-Dtest.src.path=%WS%/test/rerun/testng \
-J-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/testng \
@@ -32,6 +33,7 @@ PATH=/bin:/usr/bin:/usr/sbin \
TZ=GMT+0.00 \
CLASSPATH=%BUILD%/RerunTest.othervm/work/classes/testng:%WS%/test/rerun/testng:%BUILD%/images/jtreg/lib/testng.jar:%JDKHOME%/lib/tools.jar:%BUILD%/images/jtreg/lib/javatest.jar:%BUILD%/images/jtreg/lib/jtreg.jar \
%JDKHOME%/bin/java \
+ -Dtest.file=%WS%/test/rerun/testng/TestNGTest.java \
-Dtest.src=%WS%/test/rerun/testng \
-Dtest.src.path=%WS%/test/rerun/testng \
-Dtest.classes=%BUILD%/RerunTest.othervm/work/classes/testng \
View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/commit/4483932a3682f96c89cd0309a85850444ff70079
--
View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/commit/4483932a3682f96c89cd0309a85850444ff70079
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200405/60edb0ea/attachment.html>
More information about the pkg-java-commits
mailing list