Skip to content

Commit a73fdaa

Browse files
Mark Evensoneasye
authored andcommitted
build: fix abcl.test target
Target openjdk8 for tests.
1 parent c899fdf commit a73fdaa

1 file changed

Lines changed: 16 additions & 10 deletions

File tree

build.xml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,10 +1022,16 @@ ${basedir}/../cl-bench
10221022

10231023
<property name="junit.path"
10241024
value="${abcl.ext.dir}/junit-4.8.1.jar"/>
1025+
1026+
<!-- maven-3.9.x+ supported for openjdk8
1027+
<https://maven.apache.org/docs/history.html>
1028+
-->
1029+
<property name="maven.version"
1030+
value="3.9.12"/>
10251031
<property name="maven.dist.name"
1026-
value="apache-maven-3.3.9-bin.zip"/>
1032+
value="apache-maven-${maven.version}-bin.zip"/>
10271033
<property name="maven.dist.uri"
1028-
value="http://www-eu.apache.org/dist/maven/maven-3/3.3.9/binaries/${maven.dist.name}"/>
1034+
value="http://www.apache.org/dist/maven/maven-3/${maven.version}/binaries/${maven.dist.name}"/>
10291035
<property name="maven.local.path"
10301036
value="${abcl.ext.dir}/${maven.dist.name}"/>
10311037

@@ -1072,7 +1078,7 @@ ${basedir}/../cl-bench
10721078
<javac destdir="${abcl.test.classes.dir}"
10731079
classpathref="abcl.test.compile.classpath"
10741080
debug="true"
1075-
target="1.5">
1081+
target="1.8">
10761082
<src path="${abcl.test.src.dir}"/>
10771083
<patternset refid="abcl.test.source.java"/>
10781084
</javac>
@@ -1105,7 +1111,7 @@ ${basedir}/../cl-bench
11051111
depends="test.ansi.compiled,test.abcl,test.cl-bench"/>
11061112

11071113
<target name="test.ansi.interpreted" depends="abcl.jar">
1108-
<echo>Recording test output in ${abcl.test.log.file}.</echo>
1114+
<echo>==] Recording test output in ${abcl.test.log.file}.</echo>
11091115
<record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
11101116
<java fork="true" dir="${basedir}"
11111117
classpathref="abcl.classpath.dist"
@@ -1118,11 +1124,11 @@ ${basedir}/../cl-bench
11181124
<arg value="--eval"/><arg value="(ext:exit)"/>
11191125
</java>
11201126
<record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
1121-
<echo>Finished recording test output in ${abcl.test.log.file}.</echo>
1127+
<echo>[== Finished recording test output in ${abcl.test.log.file}.</echo>
11221128
</target>
11231129

11241130
<target name="test.ansi.compiled" depends="abcl.jar">
1125-
<echo>Recording test output in ${abcl.test.log.file}.</echo>
1131+
<echo>==] Recording test output in ${abcl.test.log.file}.</echo>
11261132
<record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
11271133
<java fork="true" dir="${basedir}"
11281134
classpathref="abcl.classpath.dist"
@@ -1140,7 +1146,7 @@ ${basedir}/../cl-bench
11401146
</target>
11411147

11421148
<target name="test.abcl" depends="abcl.jar">
1143-
<echo>Recording test output in ${abcl.test.log.file}.</echo>
1149+
<echo>[== Recording test output in ${abcl.test.log.file}.</echo>
11441150
<record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
11451151
<java fork="true" dir="${basedir}"
11461152
classpathref="abcl.classpath.dist"
@@ -1153,11 +1159,11 @@ ${basedir}/../cl-bench
11531159
<arg value="--eval"/><arg value="(ext:exit)"/>
11541160
</java>
11551161
<record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
1156-
<echo>Finished recording test output in ${abcl.test.log.file}.</echo>
1162+
<echo>==] Finished recording test output in ${abcl.test.log.file}.</echo>
11571163
</target>
11581164

11591165
<target name="test.cl-bench" depends="abcl.jar">
1160-
<echo>Recording test output in ${abcl.test.log.file}.</echo>
1166+
<echo>==] Recording test output in ${abcl.test.log.file}.</echo>
11611167
<record name="${abcl.test.log.file}" emacsmode="true" action="start" append="yes"/>
11621168
<java fork="true" dir="${basedir}"
11631169
classpathref="abcl.classpath.dist"
@@ -1172,7 +1178,7 @@ ${basedir}/../cl-bench
11721178
<arg value="--eval"/><arg value="(ext:exit)"/>
11731179
</java>
11741180
<record name="${abcl.test.log.file}" emacsmode="true" action="stop"/>
1175-
<echo>Finished recording test output in ${abcl.test.log.file}.</echo>
1181+
<echo>[== Finished recording test output in ${abcl.test.log.file}.</echo>
11761182
</target>
11771183

11781184

0 commit comments

Comments
 (0)