From e32d06d079cc4a9bbdf08a21b6a5523fed4e12b3 Mon Sep 17 00:00:00 2001
From: Shelley Lambert <smlamber@ca.ibm.com>
Date: Wed, 24 Jan 2018 09:53:24 -0500
Subject: [PATCH] Re-enabling builds of third-party containers (#225)

* Re-enable builds of third-party containers
* Update build.xml file with correct directory name
* Remove interactive mode from commandline
* Add test status
* Ignore more output files .gitignore
---
 .gitignore                                    |  9 +++-
 TestConfig/scripts/build_test.xml             |  1 -
 .../scripts/testKitGen/makeGenTool/mkgen.pl   |  2 +-
 openjdk_regression/ProblemList_openjdk8.txt   |  1 +
 thirdparty_containers/build.xml               | 41 +++++++++++++++++++
 thirdparty_containers/scala/build.xml         |  6 +--
 thirdparty_containers/scala/playlist.xml      |  3 +-
 7 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 thirdparty_containers/build.xml

diff --git a/.gitignore b/.gitignore
index df55881466..e229936f7d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,10 @@ TestConfig/jvmTest.mk
 TestConfig/specToPlat.mk
 TestConfig/*.log
 TestConfig/tempTestTargetResult
-TestConfig/failedtargets.mk
-.DS_Store
+TestConfig/failedtargets.mk
+TestConfig/std.out
+systemtest_prereqs/*
+TestConfig/lib/*
+openjdk_regression/*.gz
+example/*.jar
+.DS_Store
diff --git a/TestConfig/scripts/build_test.xml b/TestConfig/scripts/build_test.xml
index 09da3fd7c7..cace099342 100755
--- a/TestConfig/scripts/build_test.xml
+++ b/TestConfig/scripts/build_test.xml
@@ -67,7 +67,6 @@
 					<property name="JAVA_VERSION" value="${JAVA_VERSION}" />
 					<property name="compiler.javac" value="${JAVAC}" />
 					<fileset dir="../../" includes="${build.list}" >
-						<exclude name="thirdparty_containers/build.xml" />
 					</fileset>
 				</subant>
 			</then>
diff --git a/TestConfig/scripts/testKitGen/makeGenTool/mkgen.pl b/TestConfig/scripts/testKitGen/makeGenTool/mkgen.pl
index 34698ee368..4be05de2de 100755
--- a/TestConfig/scripts/testKitGen/makeGenTool/mkgen.pl
+++ b/TestConfig/scripts/testKitGen/makeGenTool/mkgen.pl
@@ -99,7 +99,7 @@ sub generateOnDir {
 	while ( my $entry = readdir $dir ) {
 		next if $entry eq '.' or $entry eq '..';
 		# temporarily exclude projects for CCM build (i.e., when JCL_VERSION is latest)
-		my $disabledDir = "thirdparty_containers";
+		my $disabledDir = "";
 		if (($JCL_VERSION ne "latest") or ($disabledDir !~ $entry )) {
 			my $projectDir  = $absolutedir . '/' . $entry;
 			if (( -f $projectDir ) && ( $entry eq 'playlist.xml' )) {
diff --git a/openjdk_regression/ProblemList_openjdk8.txt b/openjdk_regression/ProblemList_openjdk8.txt
index ca2aac11b0..4ecff1f65b 100644
--- a/openjdk_regression/ProblemList_openjdk8.txt
+++ b/openjdk_regression/ProblemList_openjdk8.txt
@@ -231,6 +231,7 @@ com/sun/tools/attach/StartManagementAgent.java	115	generic-all
 
 # jdk_jdi
 com/sun/jdi/RedefineCrossEvent.java	227	macosx-all
+
 ############################################################################
 
 # jdk_util
diff --git a/thirdparty_containers/build.xml b/thirdparty_containers/build.xml
new file mode 100644
index 0000000000..49908fc91a
--- /dev/null
+++ b/thirdparty_containers/build.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<!--
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+-->
+
+<project name="thirdparty_containers" default="build" basedir=".">
+	<taskdef resource="net/sf/antcontrib/antlib.xml" />
+	<description>
+		Build external tests
+	</description>
+
+	<!-- set properties for this build -->
+	<property name="DEST" value="${BUILD_ROOT}/thirdparty_containers" />
+
+	<target name="init">
+		<mkdir dir="${DEST}" />
+	</target>
+
+	<target name="build" depends="dist">
+		<subant target="">
+			<fileset dir="." includes="*/build.xml" />
+		</subant>		
+	</target>
+	
+	<target name="dist" depends="init">
+		<copy todir="${DEST}">
+			<fileset dir="." includes="*.mk"/>
+		</copy>
+	</target>
+</project>
\ No newline at end of file
diff --git a/thirdparty_containers/scala/build.xml b/thirdparty_containers/scala/build.xml
index 33f6f52aad..c10461c8f4 100644
--- a/thirdparty_containers/scala/build.xml
+++ b/thirdparty_containers/scala/build.xml
@@ -6,7 +6,7 @@
 	</description>
 
 	<!-- set properties for this build -->
-	<property name="DEST" value="${BUILD_ROOT}/containerTest/scala-test" />
+	<property name="DEST" value="${BUILD_ROOT}/thirdparty_containers/scala-test" />
 	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 	<property name="src" location="." />
 
@@ -14,14 +14,14 @@
 		<mkdir dir="${dist}"/>
 	</target>
 
-	<target name="clean_image" depends="init" description="build scala test docker image">
+	<target name="clean_image" depends="init" description="clean scala test docker image if there is one">
 		<exec executable="docker">
 			<arg line="rmi -f adoptopenjdk-scala-test" />
 		</exec>
 	</target>
 
 	<target name="build_image" depends="clean_image" description="build scala test docker image">
-		<exec executable="docker">
+		<exec executable="docker"  failonerror="true">
 			<arg line="build -t adoptopenjdk-scala-test -f dockerfile/Dockerfile --pull ." />
 		</exec>
 	</target>
diff --git a/thirdparty_containers/scala/playlist.xml b/thirdparty_containers/scala/playlist.xml
index 29292d3849..6264d9cf40 100644
--- a/thirdparty_containers/scala/playlist.xml
+++ b/thirdparty_containers/scala/playlist.xml
@@ -15,7 +15,8 @@
 <playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../TestConfig/playlist.xsd">
 	<test>
 		<testCaseName>scala_test</testCaseName>
-		<command>docker run -it --rm -v $(JDK_HOME):/java  adoptopenjdk-scala-test:latest "jvm pos neg"</command>
+	<command>docker run --rm -v $(JDK_HOME):/java  adoptopenjdk-scala-test:latest "jvm pos neg"; \
+		$(TEST_STATUS)</command>
 		<subsets>
 			<subset>SE80</subset>
 			<subset>SE90</subset>