From 2968fccd3258c25ec2ea8d7772ce23bb70e20265 Mon Sep 17 00:00:00 2001 From: Stephane Bailliez Date: Fri, 16 Nov 2001 22:25:59 +0000 Subject: [PATCH] Use the coverage home directory...not the JProbe home. Be consistent with other tasks. May need to refactor some code in an abstract class. Reported by stefan hardege git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269934 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/taskdefs/optional/sitraka/CovMerge.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index 70262cee2..bcf29dbac 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -157,14 +157,16 @@ public class CovMerge extends Task { if (tofile == null) { throw new BuildException("'tofile' attribute must be set."); } - if (home == null) { - throw new BuildException("'home' attribute must be set to JProbe Coverage home directory"); + + // check coverage home + if (home == null || !home.isDirectory() ) { + throw new BuildException("Invalid home directory. Must point to JProbe home directory"); } + home = new File(home,"Coverage"); File jar = new File(home, "coverage.jar"); if (!jar.exists()) { - throw new BuildException("'home' attribute is not set to Coverage home directory: " + home); + throw new BuildException("Cannot find Coverage directory: " + home); } - } /** get the snapshots from the filesets */