test fast fail
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
index 9a1758c..bf63252 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
@@ -39,9 +39,6 @@
<property
name="component"
value="@shortname@_tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
<!-- package -->
diff --git a/releng.wtpbuilder/distribution/dali.build/build.xml b/releng.wtpbuilder/distribution/dali.build/build.xml
index 421a736..04c5923 100644
--- a/releng.wtpbuilder/distribution/dali.build/build.xml
+++ b/releng.wtpbuilder/distribution/dali.build/build.xml
@@ -48,9 +48,6 @@
<property
name="component"
value="${build.distribuion}.tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
<!-- copy early, if we can ... else site won't be created, if we fail -->
diff --git a/releng.wtpbuilder/distribution/jsdt.build/build.xml b/releng.wtpbuilder/distribution/jsdt.build/build.xml
index 24a6996..81bd500 100644
--- a/releng.wtpbuilder/distribution/jsdt.build/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.build/build.xml
@@ -46,29 +46,14 @@
<property
name="component"
value="jsdt_sdk"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
- <!-- TODO: unclear if "eclipseBuildFailOnError" does anything one way or other? -->
-
-
- <!-- fast fail, if serious problem -->
- <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
-
<ant antfile="${buildTargets}">
<property
name="component"
value="jsdt_tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
- <!-- fast fail, if serious problem -->
- <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
-
<!-- we fail for compilation problems only at end, so everything gets a chance to try
and compile -->
<ant antfile="${wtp.builder.home}/scripts/build/checkForCompilationProblems.xml"/>
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index e8903ff..eed67ea 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -48,77 +48,38 @@
<property
name="component"
value="wst-sdk"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
- <!-- TODO: unclear if "eclipseBuildFailOnError" does anything one way or other? -->
-
-
- <!-- fast fail, if serious problem -->
- <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
-
<ant antfile="${buildTargets}">
<property
name="component"
value="wst.tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
-
- <!-- fast fail, if serious problem -->
- <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
<ant antfile="${buildTargets}">
<property
name="component"
value="jst-sdk"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
- <!-- fast fail, if serious problem -->
- <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
-
<ant antfile="${buildTargets}">
<property
name="component"
value="jst.tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
- <!-- fast fail, if serious problem -->
- <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
-
-
<ant antfile="${buildTargets}">
<property
name="component"
value="dali-sdk"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
- <!-- fast fail, if serious problem -->
- <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
-
<ant antfile="${buildTargets}">
<property
name="component"
value="dali.tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
- <!-- fast fail, if serious problem -->
- <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
<!-- we fail for compilation problems only at end, so everything gets a chance to try
and compile -->
diff --git a/releng.wtpbuilder/distribution/wtp4x.build/build.xml b/releng.wtpbuilder/distribution/wtp4x.build/build.xml
index 6a7f482..c78c819 100644
--- a/releng.wtpbuilder/distribution/wtp4x.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp4x.build/build.xml
@@ -47,42 +47,27 @@
<property
name="component"
value="wst4x-sdk"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="wst4x.tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="jst4x-sdk"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="jst4x.tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="dali4x-sdk"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
@@ -90,9 +75,6 @@
<property
name="component"
value="dali4x.tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
<!-- copy early, if we can ... else site won't be created, if we fail -->
diff --git a/releng.wtpbuilder/distribution/wtpcap.build/build.xml b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
index cda396c..e1be215 100644
--- a/releng.wtpbuilder/distribution/wtpcap.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.build/build.xml
@@ -39,9 +39,6 @@
<property
name="component"
value="wtpcap_tests"/>
- <property
- name="eclipseBuildFailOnError"
- value="false"/>
</ant>
<!-- package -->
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index c0e1415..d3ed134 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -44,15 +44,7 @@
<echo
level="info"
message="buildDirectory: ${buildDirectory}"/>
- <!--
- if not explicitly set by caller, we'll assume we should fail
- here on errors. In some cases, such as JUnit test compiles, or
- even leaf components, the caller may want to set to false, so
- that some part of the build is still made available
- -->
- <property
- name="eclipseBuildFailOnError"
- value="true"/>
+
<!--
We should not always normalize ("-repack") jars by default,
since in production we sign the jars (which does the -repack for
@@ -78,8 +70,13 @@
name="wtp.builder.home"
value="${scripts.build.dir}/../../.."/>
- <!-- invoke runEclipseBuild to build -->
- <antcall target="runEclipseBuild"/>
+ <!-- invoke runEclipseBuild to invokde antBuidler (just in case we
+ are not in ant builder, already) -->
+ <antcall target="runEclipseBuild" />
+
+ <!-- fast fail, if serious problem indicated in output logs -->
+ <ant antfile="${wtp.builder.home}/scripts/build/checkForFastFail.xml"/>
+
</target>
<target
name="build"
@@ -417,11 +414,17 @@
<echo message="J2SE-1.4=${J2SE-1.4}"/>
<mkdir dir="${buildDirectory}/${buildLabel}"/>
<mkdir dir="${buildDirectory}/${buildLabel}/buildworkspaces"/>
+ <!--
+ TODO: should we capture exit code in resultproperty (javaEclipseBuildResult)
+ and (eventually) take some 'fail' action ... after saving logs, etc.? ...
+ but where?
+ -->
<java
taskname="build-${build.distribution}-${component}"
jar="${eclipse.launcher}"
- fork="true"
- failonerror="${eclipseBuildFailOnError}">
+ fork="true"
+ failonerror="false"
+ resultproperty="javaResult">
<jvmarg value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
<jvmarg value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromcodebuild.log"/>
<jvmarg value="-Dosgi.ws=${env.BASEWS}"/>
@@ -462,5 +465,8 @@
<arg value="${ant.file}"/>
<arg value="build"/>
</java>
+
+ <!-- TODO: call out to check for fast fails here ... common point -->
+
</target>
</project>
\ No newline at end of file