Browse Source

Make sure we pass down ant.home to unit tests (needed to make execute

with a change of cwd work on JDK < 1.3).

Fix a copyright line.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270815 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
commit
5837816a8e
2 changed files with 4 additions and 2 deletions
  1. +3
    -1
      build.xml
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/Manifest.java

+ 3
- 1
build.xml View File

@@ -868,8 +868,9 @@
<!-- <jvmarg value="-classic"/> --> <!-- <jvmarg value="-classic"/> -->
<classpath refid="tests-classpath"/> <classpath refid="tests-classpath"/>


<sysproperty key="ant.home" value="${ant.home}" />
<sysproperty key="build.tests" value="${build.tests}"/> <sysproperty key="build.tests" value="${build.tests}"/>
<formatter type="brief" usefile="false" /> <formatter type="brief" usefile="false" />


<batchtest> <batchtest>
@@ -941,6 +942,7 @@
<junit printsummary="no" haltonfailure="yes" fork="${junit.fork}" <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}"
filtertrace="${junit.filtertrace}"> filtertrace="${junit.filtertrace}">
<!-- <jvmarg value="-classic"/> --> <!-- <jvmarg value="-classic"/> -->
<sysproperty key="ant.home" value="${ant.home}" />
<sysproperty key="build.tests" value="${build.tests}"/> <sysproperty key="build.tests" value="${build.tests}"/>
<classpath location="${java.home}/lib/classes.zip" /> <classpath location="${java.home}/lib/classes.zip" />
<classpath refid="tests-classpath"/> <classpath refid="tests-classpath"/>


+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/Manifest.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without


Loading…
Cancel
Save