added use of JAVA_VERSION_PREFIX environment variable

bcgit · Mar 2, 2024 · 8cf1e8e · 8cf1e8e
1 parent d5e9663
commit 8cf1e8e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ant/bc+-build.xml b/ant/bc+-build.xml
@@ -991,6 +991,7 @@
                 </fileset>
             </classpath>
             <sysproperty key="bc.test.data.home" value="../../core/src/test/data" />
+            <sysproperty key="test.java.version.prefix" value="${env.JAVA_VERSION_PREFIX}" />
 
             <formatter type="xml" />
             <batchtest todir="${artifacts.reports.xml.dir}" unless="testcase">

diff --git a/build1-8+ b/build1-8+
@@ -17,6 +17,12 @@ export JAVA_HOME
 PATH=$JDKPATH/bin:$PATH
 export PATH
 
+if [ "${JAVA_VERSION_PREFIX}" = "" ] 
+then
+    JAVA_VERSION_PREFIX=1.8
+    export JAVA_VERSION_PREFIX
+fi
+
 if [ "$1" = "test" ]
 then
     ant -f ant/jdk18+.xml test