From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Mon, 14 Oct 2013 16:13:15 +0000 (+0200)
Subject: Add error checking to the script
X-Git-Tag: v3_9_90~9
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4ae9f63ace263d25410e750ed2bf60b1b137dac4

Add error checking to the script
---

diff --git a/buildtools/jenkins/run.sh b/buildtools/jenkins/run.sh
index c1141b3181..9f2f34d38e 100755
--- a/buildtools/jenkins/run.sh
+++ b/buildtools/jenkins/run.sh
@@ -4,20 +4,28 @@ WORKSPACE=$1
 build_mode=$2
 
 rm -rf $WORKSPACE/build
-rm -rf $WORKSPACE/install
 
 mkdir $WORKSPACE/build
-mkdir $WORKSPACE/install
 cd $WORKSPACE/build
 
 export PATH=./lib/:../../lib:$PATH
 
 if test "$(uname -o)" = "Msys"
 then 
-    cmake -G "MSYS Makefiles" -Denable_java=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_tracing=ON $WORKSPACE
-    make
+    cmake -G "MSYS Makefiles" $WORKSPACE
+
+    if [ $? -ne 0 ] ; then
+        echo "Failed to do the first cmake - Halting"
+        exit 1
+    fi
+
     make dist
-    make nsis
+
+    if [ $? -ne 0 ] ; then
+        echo "Failed to build dist - Halting"
+        exit 2
+    fi
+
     
     if [ "$build_mode" = "Debug" ]
     then
@@ -34,14 +42,55 @@ then
     cmake -G "MSYS Makefiles" -Denable_lua=OFF -Denable_java=ON -Denable_tracing=ON -Denable_smpi=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck=ON .
     fi
 
+    if [ $? -ne 0 ] ; then
+        echo "Failed to perform the Cmake for $build_mode - Halting"
+        exit 5
+    fi
+
     make
+
+    if [ $? -ne 0 ] ; then
+        echo "Build failure - Halting"
+        exit 5
+    fi
+
+    make nsis
+
+    if [ $? -ne 0 ] ; then
+        echo "Failure while generating the Windows executable - Halting"
+        exit 6
+    fi
+
 else    
     cmake $WORKSPACE
+
+    if [ $? -ne 0 ] ; then
+        echo "Failed to do the first cmake - Halting"
+        exit 1
+    fi
+
     rm Simgrid*.tar.gz
     make dist
+
+    if [ $? -ne 0 ] ; then
+        echo "Failed to build dist - Halting"
+        exit 2
+    fi
+
     tar xzf `cat VERSION`.tar.gz
+
+    if [ $? -ne 0 ] ; then
+        echo "Failed to extract the generated tgz - Halting"
+        exit 3
+    fi
+
     cd `cat VERSION`
 
+    if [ $? -ne 0 ] ; then
+        echo "Path `cat VERSION` cannot be found - Halting"
+        exit 4
+    fi
+
     if [ "$build_mode" = "Debug" ]
     then
     cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON  -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON .
@@ -57,8 +106,18 @@ else
     cmake -Denable_lua=OFF -Denable_java=ON -Denable_tracing=ON -Denable_smpi=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck=ON .
     fi
 
+    if [ $? -ne 0 ] ; then
+        echo "Failed to perform the Cmake for $build_mode - Halting"
+        exit 5
+    fi
+
     make
-    make dist
+
+    if [ $? -ne 0 ] ; then
+        echo "Build failure - Halting"
+        exit 6
+    fi
+
 fi
 
 ctest -T test --no-compress-output  --timeout 100 || true