From 732e296e780633e3dce1bace28a4abae04f506c7 Mon Sep 17 00:00:00 2001
From: Yuan Liao <liaoyuan@gmail.com>
Date: Sat, 15 Jan 2022 10:58:28 -0800
Subject: [PATCH] Prevent test classpath from being overwritten by
 java-ant-2.eclass

Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
---
 build.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index ed3a0f7..24a3114 100644
--- a/build.xml
+++ b/build.xml
@@ -176,8 +176,12 @@
            deprecation="false"
            target="${javac.target}"
            source="${javac.source}"
-           optimize="false"
-           classpath="${build.lib}/${name}.jar;${java.class.path}"/>
+           optimize="false">
+        <classpath>
+            <pathelement location="${build.lib}/${name}.jar" />
+            <pathelement location="${java.class.path}" />
+        </classpath>
+    </javac>
     <jar jarfile="${tests.build.lib}/${name}_test.jar">
             <fileset dir="." includes="NOTICE LICENSE"/>
             <fileset dir="${tests.build.classes}"/>
-- 
2.34.1