Better error message for check_machines

1 files changed, 102 insertions, 2 deletions

diff --git a/bundles/org.eclipse.swt/tasks/build.xml b/bundles/org.eclipse.swt/tasks/build.xml
index 4ba3cc7287..d49f2d3b6c 100644
--- a/bundles/org.eclipse.swt/tasks/build.xml
+++ b/bundles/org.eclipse.swt/tasks/build.xml
@@ -625,73 +625,173 @@
 		<sshexec host="${m_linux_x86}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_linux_x86_output"
 			command="hostname"/>
 		<sshexec host="${m_linux_x86_64}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_linux_x86_64_output"
 			command="hostname"/>
 		<!-- These machines are only used for 3.5.x builds. -->
 		<!--sshexec host="${m_linux_rh3_x86}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_linux_rh3_x86_output"
 			command="hostname"/>
 		<sshexec host="${m_linux_rh3_x86_64}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_linux_rh3_x86_64_output"
 			command="hostname"/-->
 		<sshexec host="${m_linux_ppc}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_linux_ppc_output"
 			command="hostname"/>
 		<sshexec host="${m_linux_ppc64}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_linux_ppc64_output"
 			command="hostname"/>
 		<sshexec host="${m_solaris_sparc}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_solaris_sparc_output"
 			command="hostname"/>
 		<sshexec host="${m_solaris_x86}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_solaris_x86_output"
 			command="hostname"/>
 		<sshexec host="${m_aix}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_aix_output"
 			command="hostname"/>
 		<sshexec host="${m_hpux}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_hpux_output"
 			command="hostname"/>
 		<sshexec host="${m_mac}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
+			outputproperty="m_mac_output"
 			command="hostname"/>
 		</parallel>
+		<property name="success_msg" value="Success"/>
+		<property name="fail_msg" value="*** Fail ***"/>
+		<condition property="m_linux_x86_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_linux_x86}*" string="${m_linux_x86_output}"/>
+		</condition>
+		<condition property="m_linux_x86_64_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_linux_x86_64}*" string="${m_linux_x86_64_output}"/>
+		</condition>
+		<!--condition property="m_linux_rh3_x86_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_linux_rh3_x86}*" string="${m_linux_rh3_x86_output}"/>
+		</condition>
+		<condition property="m_linux_rh3_x86_64_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_linux_rh3_x86_64}*" string="${m_linux_rh3_x86_64_output}"/>
+		</condition-->
+		<condition property="m_linux_ppc_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_linux_ppc}*" string="${m_linux_ppc_output}"/>
+		</condition>
+		<condition property="m_linux_ppc64_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_linux_ppc64}*" string="${m_linux_ppc64_output}"/>
+		</condition>
+		<condition property="m_solaris_sparc_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_solaris_sparc}*" string="${m_solaris_sparc_output}"/>
+		</condition>
+		<condition property="m_solaris_x86_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_solaris_x86}*" string="${m_solaris_x86_output}"/>
+		</condition>
+		<condition property="m_aix_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_aix}*" string="${m_aix_output}"/>
+		</condition>
+		<condition property="m_hpux_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_hpux}*" string="${m_hpux_output}"/>
+		</condition>
+		<condition property="m_mac_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_mac}*" string="${m_mac_output}"/>
+		</condition>
+		<echo>-------------------------</echo>
+		<echo>Status:</echo>
+		<echo></echo>
+		<echo>${m_linux_x86} - ${m_linux_x86_test}</echo>
+		<echo>${m_linux_x86_64} - ${m_linux_x86_64_test}</echo>
+		<!--echo>${m_linux_rh3_x86} ${m_linux_rh3_x86_test}</echo>
+		<echo>${m_linux_rh3_x86_64} ${m_linux_rh3_x86_64_test}</echo-->
+		<echo>${m_linux_ppc} - ${m_linux_ppc_test}</echo>
+		<echo>${m_linux_ppc64} - ${m_linux_ppc64_test}</echo>
+		<echo>${m_solaris_sparc} - ${m_solaris_sparc_test}</echo>
+		<echo>${m_solaris_x86} - ${m_solaris_x86_test}</echo>
+		<echo>${m_aix} - ${m_aix_test}</echo>
+		<echo>${m_hpux} - ${m_hpux_test}</echo>
+		<echo>${m_mac} - ${m_mac_test}</echo>
+		<echo>-------------------------</echo>
+		<condition property="m_fail">
+			<matches pattern="Fail" string="${m_linux_x86_test} ${m_linux_x86_64_test} ${m_linux_ppc_test} ${m_linux_ppc64_test} ${m_solaris_sparc_test} ${m_solaris_x86_test} ${m_aix_test} ${m_hpux_test} ${m_mac_test}"/>
+		</condition>
+		<fail if="m_fail" message="Failed"/>
 	</target>
 
 	<target name="check_s390_machines">
+		<parallel>
 		<sshexec host="${m_linux_x86}" 
 			username="swtbuild" 
 			keyfile="${keyfile}"
+			failonerror="false"
 			trust="true"
-			command="hostname; ping -c 1 ${m_linux_s390};"/>
+			outputproperty="m_linux_s390_output"
+			command="ping -c 1 ${m_linux_s390}; hostname;"/>
 		<sshexec host="${m_linux_x86}" 
 			username="swtbuild" 
 			keyfile="${keyfile}" 
+			failonerror="false"
 			trust="true"
-			command="hostname; ping -c 1 ${m_linux_s390x};"/>
+			outputproperty="m_linux_s390x_output"
+			command="ping -c 1 ${m_linux_s390x}; hostname;"/>
+		</parallel>
+		<property name="success_msg" value="Success"/>
+		<property name="fail_msg" value="*** Fail ***"/>
+		<condition property="m_linux_s390_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_linux_x86}*" string="${m_linux_s390_output}"/>
+		</condition>
+		<condition property="m_linux_s390x_test" value="${success_msg}" else="${fail_msg}">
+			<matches pattern="${m_linux_x86}*" string="${m_linux_s390x_output}"/>
+		</condition>
+		<echo>-------------------------</echo>
+		<echo>Status:</echo>
+		<echo></echo>
+		<echo>${m_linux_s390} - ${m_linux_s390_test}</echo>
+		<echo>${m_linux_s390x} - ${m_linux_s390x_test}</echo>
+		<echo>-------------------------</echo>
+		<condition property="m_fail">
+			<matches pattern="Fail" string="${m_linux_s390_test} ${m_linux_s390x_test}"/>
+		</condition>
+		<fail if="m_fail" message="Failed"/>
 	</target>
 	
 	<target name="check_compilation">