From 9c0047961d3de89fca1814d6055ec03955fb0c36 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 25 Feb 2005 13:15:42 +0000 Subject: [PATCH] I don't see the debug output in the Kaffe Gump run, try it unconditionally git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@277737 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/DirectoryScannerTest.java | 10 +--------- .../taskdefs/condition/ParserSupportsTest.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java index d75919e75..205d528ce 100644 --- a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java +++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java @@ -229,9 +229,7 @@ public class DirectoryScannerTest extends BuildFileTest { public void testSetFollowLinks() throws IOException { if (supportsSymlinks) { File linkFile = new File(System.getProperty("root"), "src/main/org/apache/tools/ThisIsALink"); - if (JavaEnvUtils.isKaffe()) { - System.err.println("link exists pre-test? " + linkFile.exists()); - } + System.err.println("link exists pre-test? " + linkFile.exists()); try { // add conditions and more commands as soon as the need arises @@ -250,10 +248,8 @@ public class DirectoryScannerTest extends BuildFileTest { } File dir = new File(System.getProperty("root"), "src/main/org/apache/tools"); - if (JavaEnvUtils.isKaffe()) { System.err.println("link exists after exec? " + linkFile.exists()); System.err.println("Ant knows it is a link? " + FileUtils.getFileUtils().isSymbolicLink(dir, "ThisIsALink")); - } DirectoryScanner ds = new DirectoryScanner(); @@ -311,16 +307,12 @@ public class DirectoryScannerTest extends BuildFileTest { !haveTaskdefsPackage); } finally { - if (JavaEnvUtils.isKaffe()) { System.err.println("link exists pre-delete? " + linkFile.exists()); - } if (!linkFile.delete()) { throw new RuntimeException("Failed to delete " + linkFile); } - if (JavaEnvUtils.isKaffe()) { System.err.println("link exists post-delete? " + linkFile.exists()); } - } } } public void testExcludeOneFile() { diff --git a/src/testcases/org/apache/tools/ant/taskdefs/condition/ParserSupportsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/condition/ParserSupportsTest.java index c2cbd678d..7f9f575be 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/condition/ParserSupportsTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/condition/ParserSupportsTest.java @@ -1,3 +1,20 @@ +/* + * Copyright 2005 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + package org.apache.tools.ant.taskdefs.condition; import org.apache.tools.ant.BuildFileTest;