From 649d8376e35f84c74d80c07ead0776c7e97f52e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Thu, 23 Apr 2015 22:11:59 +0200
Subject: [PATCH] Build newversion only when tests are okay

---
 build_common.xml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/build_common.xml b/build_common.xml
index a6a2c4590..ad8ee3ee5 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -108,7 +108,14 @@
         </javac>
     </target>
 
-    <target name="test" depends="test_lib,compile,compile-tests">
+    <target name="-test-halt-newver" if="NEWVER">
+        <property name="TESTHALTFAILURE" value="true" />
+    </target>
+    <target name="-test-halt-nonewver" unless="NEWVER">
+        <property name="TESTHALTFAILURE" value="false" />
+    </target>
+
+    <target name="test" depends="-test-halt-newver,-test-halt-nonewver,test_lib,compile,compile-tests">
         <delete dir="${TESTRESULTSDIR}"/>
         <mkdir dir="${TESTRESULTSDIR}"/>
         <mkdir dir="${TESTRESULTSDIR}/raw/"/>
@@ -120,7 +127,7 @@
         
         <testng 
             outputDir="${TESTRESULTSDIR}"
-            haltOnFailure="false" verbose="2" workingDir="${basedir}" >
+            haltOnFailure="${TESTHALTFAILURE}" verbose="2" workingDir="${basedir}">
         
             <classpath>
                 <pathelement path="${COMPILETESTSDIR}"/>
@@ -708,20 +715,24 @@
         
     </target>
     
-    <target name="new-version-major" depends="git-pull,-inc-major,-check-version-online,all,-upload,git-push">
+    <target name="-new-version-set">
+        <property name="NEWVER" value="1" />
+    </target>
+    
+    <target name="new-version-major" depends="git-pull,-new-version-set,-inc-major,-check-version-online,all,-upload,git-push">
         
     </target>
     
-    <target name="new-version-minor" depends="git-pull,-inc-minor,-check-version-online,all,-upload,git-push">
+    <target name="new-version-minor" depends="git-pull,-new-version-set,-inc-minor,-check-version-online,all,-upload,git-push">
         
     </target>
     
-    <target name="new-version-release" depends="git-pull,-inc-release,-check-version-online,all,-upload,git-push">
+    <target name="new-version-release" depends="git-pull,-new-version-set,-inc-release,-check-version-online,all,-upload,git-push">
        
     </target>
        
         
-    <target name="new-version-nightlybuild" depends="git-pull,-inc-nightlybuild,-check-version-online,all,-upload,git-push">
+    <target name="new-version-nightlybuild" depends="git-pull,-new-version-set,-inc-nightlybuild,-check-version-online,all,-upload,git-push">
 
     </target>