From 71be9bc2d672d09173a5d47a4acd18c18186ac37 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 19 Sep 2003 09:18:16 +0000 Subject: [PATCH] replaced the CLASSPATH instead of adding to it. PR: 14971 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275265 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ .../tools/ant/taskdefs/optional/junit/JUnitTask.java | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/WHATSNEW b/WHATSNEW index f763f6177..e20e2a8a1 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -242,6 +242,9 @@ Fixed bugs: * The socket condition will now close the socket created to test. Bugzilla Report 23040. +* replaced the CLASSPATH instead + of adding to it. Bugzilla Report 14971. + Other changes: -------------- * All tasks can be used outside of s. Note that some tasks diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index b64a1eb3d..8ac01009c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -717,6 +717,17 @@ public class JUnitTask extends Task { cmd.createArgument().setValue("haltOnFailure=" + test.getHaltonfailure()); if (includeAntRuntime) { + Vector v = Execute.getProcEnvironment(); + Enumeration e = v.elements(); + while (e.hasMoreElements()) { + String s = (String) e.nextElement(); + if (s.startsWith("CLASSPATH=")) { + cmd.createClasspath(getProject()).createPath() + .append(new Path(getProject(), + s.substring(10 // "CLASSPATH=".length() + ))); + } + } log("Implicitly adding " + antRuntimeClasses + " to CLASSPATH", Project.MSG_VERBOSE); cmd.createClasspath(getProject()).createPath()