Browse Source

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
master
Stefan Bodewig 20 years ago
parent
commit
9c0047961d
2 changed files with 18 additions and 9 deletions
  1. +1
    -9
      src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
  2. +17
    -0
      src/testcases/org/apache/tools/ant/taskdefs/condition/ParserSupportsTest.java

+ 1
- 9
src/testcases/org/apache/tools/ant/DirectoryScannerTest.java View File

@@ -229,9 +229,7 @@ public class DirectoryScannerTest extends BuildFileTest {
public void testSetFollowLinks() throws IOException { public void testSetFollowLinks() throws IOException {
if (supportsSymlinks) { if (supportsSymlinks) {
File linkFile = new File(System.getProperty("root"), "src/main/org/apache/tools/ThisIsALink"); 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 { try {
// add conditions and more commands as soon as the need arises // 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"); 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("link exists after exec? " + linkFile.exists());
System.err.println("Ant knows it is a link? " + FileUtils.getFileUtils().isSymbolicLink(dir, "ThisIsALink")); System.err.println("Ant knows it is a link? " + FileUtils.getFileUtils().isSymbolicLink(dir, "ThisIsALink"));
}


DirectoryScanner ds = new DirectoryScanner(); DirectoryScanner ds = new DirectoryScanner();


@@ -311,16 +307,12 @@ public class DirectoryScannerTest extends BuildFileTest {
!haveTaskdefsPackage); !haveTaskdefsPackage);


} finally { } finally {
if (JavaEnvUtils.isKaffe()) {
System.err.println("link exists pre-delete? " + linkFile.exists()); System.err.println("link exists pre-delete? " + linkFile.exists());
}
if (!linkFile.delete()) { if (!linkFile.delete()) {
throw new RuntimeException("Failed to delete " + linkFile); throw new RuntimeException("Failed to delete " + linkFile);
} }
if (JavaEnvUtils.isKaffe()) {
System.err.println("link exists post-delete? " + linkFile.exists()); System.err.println("link exists post-delete? " + linkFile.exists());
} }
}
} }
} }
public void testExcludeOneFile() { public void testExcludeOneFile() {


+ 17
- 0
src/testcases/org/apache/tools/ant/taskdefs/condition/ParserSupportsTest.java View File

@@ -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; package org.apache.tools.ant.taskdefs.condition;


import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.BuildFileTest;


Loading…
Cancel
Save