bodewig 2005/02/25 05:15:42
Modified: src/testcases/org/apache/tools/ant DirectoryScannerTest.java
src/testcases/org/apache/tools/ant/taskdefs/condition
ParserSupportsTest.java
Log:
I don't see the debug output in the Kaffe Gump run, try it unconditionally
Revision Changes Path
1.32 +1 -9
ant/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
Index: DirectoryScannerTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DirectoryScannerTest.java 9 Feb 2005 08:16:03 -0000 1.31
+++ DirectoryScannerTest.java 25 Feb 2005 13:15:41 -0000 1.32
@@ -229,9 +229,7 @@
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 @@
}
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 @@
!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() {
1.2 +17 -0
ant/src/testcases/org/apache/tools/ant/taskdefs/condition/ParserSupportsTest.java
Index: ParserSupportsTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/condition/ParserSupportsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParserSupportsTest.java 25 Feb 2005 11:32:35 -0000 1.1
+++ ParserSupportsTest.java 25 Feb 2005 13:15:42 -0000 1.2
@@ -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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
