Add openjdk.test.mauve configure to openjdk.build (#264)

Signed-off-by: Simon Rushton <rushton@uk.ibm.com>
adoptium · May 20, 2019 · 2f67b29 · 2f67b29
1 parent 6561d2c
commit 2f67b29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/openjdk.build/build.xml b/openjdk.build/build.xml
@@ -55,6 +55,7 @@ limitations under the License.
 		<ant antfile="${openjdk_systemtest_root}/openjdk.test.load/build.xml" dir="${openjdk_systemtest_root}/openjdk.test.load" inheritAll="true"/>
 		<ant antfile="${openjdk_systemtest_root}/openjdk.test.locking/build.xml" dir="${openjdk_systemtest_root}/openjdk.test.locking" inheritAll="true"/>
 		<ant antfile="${openjdk_systemtest_root}/openjdk.test.math/build.xml" dir="${openjdk_systemtest_root}/openjdk.test.math" inheritAll="true"/>
+		<ant antfile="${openjdk_systemtest_root}/openjdk.test.mauve/build.xml" dir="${openjdk_systemtest_root}/openjdk.test.mauve" inheritAll="true"/>
 		<ant antfile="${openjdk_systemtest_root}/openjdk.test.nio/build.xml" dir="${openjdk_systemtest_root}/openjdk.test.nio" inheritAll="true"/>
 		<ant antfile="${openjdk_systemtest_root}/openjdk.test.serialization/build.xml" dir="${openjdk_systemtest_root}/openjdk.test.serialization" inheritAll="true"/>
 		<ant antfile="${openjdk_systemtest_root}/openjdk.test.util/build.xml" dir="${openjdk_systemtest_root}/openjdk.test.util" inheritAll="true"/>

diff --git a/openjdk.test.mauve/build.xml b/openjdk.test.mauve/build.xml
@@ -389,14 +389,14 @@ limitations under the License.
 		<download-file destdir="${prereqs_root}/cvsclient" destfile="org-netbeans-lib-cvsclient.jar" srcurl="https://netbeans.org/projects/versioncontrol/downloads/download/org-netbeans-lib-cvsclient.jar"/>
 	</target>
 
-	<target name="install-archives" if="work_jar_file_exists">
+	<target name="install-archives" if="openjdk_test_mauve_work_jar_file_exists">
 		<echo message="Copying ${openjdk_test_mauve_work_jar_file} to directory ${openjdk_test_mauve_final_dir}"/>
 		<copy file="${openjdk_test_mauve_work_jar_file}" todir="${openjdk_test_mauve_final_dir}"/>
 	</target>
 
 	<target name="check-if-work_jar_file-exists">
 		<echo message="Checking if ${openjdk_test_mauve_work_jar_file} exists"/>
-		<available file="${openjdk_test_mauve_work_jar_file}" property="work_jar_file_exists"/>
+		<available file="${openjdk_test_mauve_work_jar_file}" property="openjdk_test_mauve_work_jar_file_exists"/>
 		<echo message="openjdk_test_mauve_work_jar_file_exists is ${openjdk_test_mauve_work_jar_file_exists}"/>
 	</target>