Browse Source

fixes to make ajctests mostly running - still getting some silent failures?

tags/V_1_1_b5
wisberg 21 years ago
parent
commit
680908c84f
1 changed files with 46 additions and 81 deletions
  1. 46
    81
      tests/test-other-systems.xml

+ 46
- 81
tests/test-other-systems.xml View File

Runs cycles of ajc/ajdoc/java on other large systems, Runs cycles of ajc/ajdoc/java on other large systems,
using taskdef in testing module. Expected and generated files: using taskdef in testing module. Expected and generated files:


build/
aj-results/
jars/
testing-drivers-all.jar # taskdef and required libraries
aj-build/
jars/
testing-drivers-all.jar # taskdef and required libraries
lib/ lib/
test-other-systems/ test-other-systems/
other-systems-src.zip # sources for other systems other-systems-src.zip # sources for other systems
<property name="jdk.tools.jar" <property name="jdk.tools.jar"
location="XXXTODO_DEFINE_TOOLS.jar"/> location="XXXTODO_DEFINE_TOOLS.jar"/>


<property name="aspectj.modules.build.dir"
location="${basedir}/../build"/>
<property name="aspectj.modules.dir"
location="${basedir}/.."/>
<property name="aj.build.results.dir" <property name="aj.build.results.dir"
location="${aspectj.modules.build.dir}/aj-results"/>
location="${aspectj.modules.dir}/aj-build"/>
<property name="aspectj.modules.lib.dir" <property name="aspectj.modules.lib.dir"
location="${basedir}/../lib"/>
location="${aspectj.modules.dir}/lib"/>
<property name="aspectj.other-systems.lib.dir" <property name="aspectj.other-systems.lib.dir"
location="${aspectj.modules.lib.dir}/test-other-systems"/> location="${aspectj.modules.lib.dir}/test-other-systems"/>


<!-- base dir for other-systems test sources --> <!-- base dir for other-systems test sources -->
<!-- zip of other-systems test sources --> <!-- zip of other-systems test sources -->


<property name="aj.otherSystems.dir"
location="${basedir}/aj-other-systems"/>
<!-- temporary base dir for unzipped test data is not in build temp dir b/c costly --> <!-- temporary base dir for unzipped test data is not in build temp dir b/c costly -->
<property name="aj.otherSystems.dir" <property name="aj.otherSystems.dir"
location="${basedir}/aj-other-systems"/> location="${basedir}/aj-other-systems"/>
<!-- temp classes dir --> <!-- temp classes dir -->
<property name="output.classes.dir" <property name="output.classes.dir"
location="${aj.otherSystems.dir}/classes"/> location="${aj.otherSystems.dir}/classes"/>
<!-- temp working dir XXX unused -->
<property name="workingdir"
location="${aj.otherSystems.dir}/workingdir"/>
<!-- run from source files directory --> <!-- run from source files directory -->
<property name="otherSystems.run.dir" <property name="otherSystems.run.dir"
location="${aj.otherSystems.src.dir}"/> location="${aj.otherSystems.src.dir}"/>


<!-- XXX dependency on ../build/build.xml value for jar output position --> <!-- XXX dependency on ../build/build.xml value for jar output position -->
<property name="aj.jar.dir" <property name="aj.jar.dir"
location="${aspectj.modules.build.dir}/aj-results/jars"/>
location="${aj.build.results.dir}/jars"/>
<property name="aj.modules.runtime.jar" <property name="aj.modules.runtime.jar"
location="${aj.jar.dir}/runtime.jar"/> location="${aj.jar.dir}/runtime.jar"/>
<property name="aj.modules.eajctesting.jar" <property name="aj.modules.eajctesting.jar"
location="${aj.jar.dir}/testing-drivers-all.jar"/> location="${aj.jar.dir}/testing-drivers-all.jar"/>


<property name="ajctest.classpath" <property name="ajctest.classpath"
value="${aj.modules.eajctesting.jar}${path.separator}${jdk.tools.jar}" />
value="${aj.modules.eajctesting.jar}" />


<!-- unzipped libraries --> <!-- unzipped libraries -->
<property name="otherSystems.src.zip" <property name="otherSystems.src.zip"
<!-- sensible alias to combined other-systems test sources --> <!-- sensible alias to combined other-systems test sources -->
<property name="ajctest.src.dir" <property name="ajctest.src.dir"
value="${aj.otherSystems.src.dir}"/> value="${aj.otherSystems.src.dir}"/>
<!-- system classes directory -->
<!-- runtime classes passed to ajctest using classpath -->
<property name="aj.runtime.classes" <property name="aj.runtime.classes"
value="${aj.modules.runtime.jar}"/> value="${aj.modules.runtime.jar}"/>


<property name="ajctest.classpath"
value="${aj.modules.eajctesting.jar}${path.separator}${jdk.tools.jar}" />

<!-- set args applied to ajc when running all tests --> <!-- set args applied to ajc when running all tests -->
<property name="ajctest.args" <property name="ajctest.args"
value="" /> value="" />


<!-- echo settings that affect running --> <!-- echo settings that affect running -->
<echo> <echo>
"## ajctest FYI skip.hard.tests: ${skip.hard.tests}"
"## ajctest FYI ajctest.classpath: ${ajctest.classpath}"
"## ajctest FYI ajctest.args: ${ajctest.args}"
"## ajctest FYI ajctest.compiler: ${ajctest.compiler}"
"## ajctest FYI -----------------------------------"
"## skip.hard.tests: ${skip.hard.tests}"
"## ajctest.classpath: ${ajctest.classpath}"
"## ajctest.args: ${ajctest.args}"
"## ajctest.compiler: ${ajctest.compiler}"
"## ajctest.wrapper.jar: ${ajctest.wrapper.jar}"
"## ajctest -----------------------------------"
</echo> </echo>


<taskdef name="ajctest" <taskdef name="ajctest"


<target name="warnings" depends="init"> <target name="warnings" depends="init">
<fail unless="aj.modules.runtime.jar.available" <fail unless="aj.modules.runtime.jar.available"
message="build ${aj.modules.runtime.jar}"/>
message="build runtime: ${aj.modules.runtime.jar}"/>
<fail unless="aj.modules.eajctesting.jar.available" <fail unless="aj.modules.eajctesting.jar.available"
message="build ${aj.modules.eajctesting.jar}"/>
message="build ${aj.modules.eajctesting.jar} using
ant build.xml build-testing-drivers
"/>
<fail unless="otherSystems.src.zip.available" <fail unless="otherSystems.src.zip.available"
message="get ${otherSystems.src.zip}"/> message="get ${otherSystems.src.zip}"/>
</target> </target>
depends="rsa,biojava,jato,kawa, depends="rsa,biojava,jato,kawa,
gnuprolog,jarp,jiu, gnuprolog,jarp,jiu,
tt-bytecode,xc4j,jmeter,bcel, tt-bytecode,xc4j,jmeter,bcel,
jame,sablecc,examples, nsuml,jsci,
jame,sablecc,examples,nsuml,jsci,
applets"/> applets"/>


<!-- ============================================================ --> <!-- ============================================================ -->
<!-- ============================================================ --> <!-- ============================================================ -->
<target name="clean" unless="noclean"> <target name="clean" unless="noclean">
<delete dir="${output.classes.dir}"/> <delete dir="${output.classes.dir}"/>
<delete dir="${workingdir}"/>
</target> </target>


<!-- ============================================================ --> <!-- ============================================================ -->
<target name="testWrap" depends="prepare" <target name="testWrap" depends="prepare"
description="(wes-only) target for testing ajclean and build scripts" > description="(wes-only) target for testing ajclean and build scripts" >
<ajctest testId="testWrap" <ajctest testId="testWrap"
dir="c:/home/wes/work/src"
dir="/home/wes/work/src"
args="${ajctest.args}" args="${ajctest.args}"
destdir="${output.classes.dir}" > destdir="${output.classes.dir}" >
<classpath> <classpath>
<target name="rsa" depends="prepare"> <target name="rsa" depends="prepare">
<ajctest testId="rsa" <ajctest testId="rsa"
dir="${ajctest.src.dir}/rsa" dir="${ajctest.src.dir}/rsa"
args="showversion,${ajctest.args}"
args="version,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${output.classes.dir}"/> <pathelement path="${output.classes.dir}"/>
<testset argfiles="main.lst,lexer-aspect.lst"/> <testset argfiles="main.lst,lexer-aspect.lst"/>
</ajctest> </ajctest>
</target> </target>
<!--
-->
<target name="mmexamples" depends="prepare">
<ajctest testId="examples"
dir="examples"
destdir="${output.classes.dir}">
<testset argfiles="bean/files.lst"
classes="bean.Demo"/>
</ajctest>
</target>
<target name="examples" depends="prepare">

<target name="examples" depends="init">
<property name="aj.tempExamples.dir"
location="${aj.otherSystems.dir}/examples"/>
<mkdir dir="${aj.tempExamples.dir}"/>
<copy todir="${aj.tempExamples.dir}">
<fileset dir="../docs/dist/doc/examples"/>
</copy>
<!-- copy to temp.examples.dir -->
<ajctest testId="examples" <ajctest testId="examples"
dir="./examples"
dir="${aj.tempExamples.dir}"
args="${ajctest.args}" args="${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<testset argfiles="telecom/timing.lst" <testset argfiles="telecom/timing.lst"
classes="telecom.TimingSimulation" /> classes="telecom.TimingSimulation" />


<testset argfiles="timeserver/abort.lst"
classes=""/>
<testset argfiles="timeserver/retry.lst"
classes=""/>
<testset argfiles="tjp/files.lst" <testset argfiles="tjp/files.lst"
classes="tjp.Demo"/> classes="tjp.Demo"/>
<testset argfiles="tracing/notrace.lst" <testset argfiles="tracing/notrace.lst"
<echo message="tools: ${jdk.tools.jar}"/> <echo message="tools: ${jdk.tools.jar}"/>
<ajctest testId="ajc" <ajctest testId="ajc"
dir="${ajctest.src.dir}/ajc-src" dir="${ajctest.src.dir}/ajc-src"
args="nosymbols,timings,JXmx256M,${ajctest.args}"
args="time,JXmx256M,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${jdk.tools.jar}"/> <pathelement path="${jdk.tools.jar}"/>
unless="skip.hard.tests" > unless="skip.hard.tests" >
<ajctest testId="hard-ajc" <ajctest testId="hard-ajc"
dir="${ajctest.src.dir}/ajc-src" dir="${ajctest.src.dir}/ajc-src"
args="nosymbols,timings,JXmx350M,${ajctest.args}"
args="time,JXmx350M,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${jdk.tools.jar}"/> <pathelement path="${jdk.tools.jar}"/>
<target name="java-src" depends="prepare"> <target name="java-src" depends="prepare">
<ajctest testId="java-src" <ajctest testId="java-src"
dir="${ajctest.src.dir}/java-src" dir="${ajctest.src.dir}/java-src"
args="JXmx256M,timings,${ajctest.args}"
args="JXmx256M,time,${ajctest.args}"
destdir="${output.classes.dir}" destdir="${output.classes.dir}"
depends="java-src.depends"> depends="java-src.depends">
<classpath> <classpath>
exceptions because of a known bug in swing: exceptions because of a known bug in swing:
- FileChooserDemo - FileChooserDemo
- Metalworks - Metalworks
Update: they fail to compile unless using proper JDK libraries
-------------------- INFORMATION --------------------- -------------------- INFORMATION ---------------------
</echo> </echo>
</target> </target>
</ajctest> </ajctest>
</target> </target>


<!-- ============================================================ -->
<!-- Help -->
<!-- ============================================================ -->
<target name="help">
<echo>
Usage: ant -f ${ant.file} [ant-options] [options]
where ant-options can be found be typing:

ant -help

and where options include:
-Dnodownload=true do NOT download test files
-Dnocompile=true do NOT compile files, just run the tests
-Dnoclean=true do NOT clean the ${output.classes.dir} before each test
-Dnodoc=true do NOT generate run ajdoc
-Dgui=true display the GUI helper
-help print this help message
-Ddumpresults dump the results to a file
named ajctest-errors[date-and-time].txt
</echo>
</target>


<!-- ============================================================ --> <!-- ============================================================ -->
<!-- Tests for ajctest taskdef --> <!-- Tests for ajctest taskdef -->
<!-- ============================================================ --> <!-- ============================================================ -->
<target name="testAjctest.depends" <target name="testAjctest.depends"
depends="prepare"> depends="prepare">
<property name="testAjctest.src.dir" <property name="testAjctest.src.dir"
location="${aspectj.test.src.dir}/harness/ajctest"/>
location="${basedir}/harness/ajctest"/>
</target> </target>


<target name="testAjctest.all" depends="testAjctest.depends"> <target name="testAjctest.all" depends="testAjctest.depends">
<ajctest testId="testAjctest.all" <ajctest testId="testAjctest.all"
dir="${testAjctest.src.dir}" dir="${testAjctest.src.dir}"
args="showversion,${ajctest.args}"
args="version,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${output.classes.dir}"/> <pathelement path="${output.classes.dir}"/>
<target name="testAjctest.normal.pass" depends="testAjctest.depends"> <target name="testAjctest.normal.pass" depends="testAjctest.depends">
<ajctest testId="testAjctest.normal.pass" <ajctest testId="testAjctest.normal.pass"
dir="${testAjctest.src.dir}" dir="${testAjctest.src.dir}"
args="showversion,${ajctest.args}"
args="version,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${output.classes.dir}"/> <pathelement path="${output.classes.dir}"/>
<target name="testAjctest.exception.fail" depends="testAjctest.depends"> <target name="testAjctest.exception.fail" depends="testAjctest.depends">
<ajctest testId="testAjctest.exception.fail" <ajctest testId="testAjctest.exception.fail"
dir="${testAjctest.src.dir}" dir="${testAjctest.src.dir}"
args="showversion,${ajctest.args}"
args="version,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${output.classes.dir}"/> <pathelement path="${output.classes.dir}"/>
<target name="testAjctest.error.fail" depends="testAjctest.depends"> <target name="testAjctest.error.fail" depends="testAjctest.depends">
<ajctest testId="testAjctest.error.fail" <ajctest testId="testAjctest.error.fail"
dir="${testAjctest.src.dir}" dir="${testAjctest.src.dir}"
args="showversion,${ajctest.args}"
args="version,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${output.classes.dir}"/> <pathelement path="${output.classes.dir}"/>
<target name="testAjctest.exit.fail" depends="testAjctest.depends"> <target name="testAjctest.exit.fail" depends="testAjctest.depends">
<ajctest testId="testAjctest.exit.fail" <ajctest testId="testAjctest.exit.fail"
dir="${testAjctest.src.dir}" dir="${testAjctest.src.dir}"
args="showversion,${ajctest.args}"
args="version,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${output.classes.dir}"/> <pathelement path="${output.classes.dir}"/>
<target name="testAjctest.exit.pass" depends="testAjctest.depends"> <target name="testAjctest.exit.pass" depends="testAjctest.depends">
<ajctest testId="testAjctest.exit.pass" <ajctest testId="testAjctest.exit.pass"
dir="${testAjctest.src.dir}" dir="${testAjctest.src.dir}"
args="showversion,${ajctest.args}"
args="version,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${output.classes.dir}"/> <pathelement path="${output.classes.dir}"/>
<target name="testAjctest.compileFailure.fail" depends="testAjctest.depends"> <target name="testAjctest.compileFailure.fail" depends="testAjctest.depends">
<ajctest testId="testAjctest.compileFailure.fail" <ajctest testId="testAjctest.compileFailure.fail"
dir="${testAjctest.src.dir}" dir="${testAjctest.src.dir}"
args="showversion,${ajctest.args}"
args="version,${ajctest.args}"
destdir="${output.classes.dir}"> destdir="${output.classes.dir}">
<classpath> <classpath>
<pathelement path="${output.classes.dir}"/> <pathelement path="${output.classes.dir}"/>

Loading…
Cancel
Save