X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fbuild.sh;h=2f921352e3a6520e4d5c682acfd6e65ca00ea222;hp=6c817ae851695ca505b1d42ac9535007539514d8;hb=HEAD;hpb=441d0d644e9047c09a1bc8f275c2eb8d28bee4e4

diff --git a/automated-tests/build.sh b/automated-tests/build.sh
index 6c817ae..a56cd87 100755
--- a/automated-tests/build.sh
+++ b/automated-tests/build.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+
 TEMP=`getopt -o rn --long rebuild,no-gen \
      -n 'genmake' -- "$@"`
 
@@ -31,7 +32,13 @@ function build
         (cd src/$1; ../../scripts/tcheadgen.sh tct-$1-core.h)
         if [ $? -ne 0 ]; then echo "Aborting..."; exit 1; fi
     fi
-    (cd build ; cmake .. -DMODULE=$1 ; make -j7 )
+    BUILDSYSTEM="Unix Makefiles"
+    BUILDCMD=make
+    if [ -e ../build/tizen/build.ninja ] ; then
+        BUILDSYSTEM="Ninja"
+        BUILDCMD=ninja
+    fi
+    (cd build ; cmake .. -DMODULE=$1 -G "$BUILDSYSTEM" ; $BUILDCMD -j7 )
 }
 
 if [ -n "$1" ] ; then
@@ -43,6 +50,10 @@ else
     if [ $mod != 'common' ] && [ $mod != 'manual' ]; then
         echo BUILDING $mod
         build $mod
+        if [ $? -ne 0 ]; then echo "Build failed" ; exit 1; fi
     fi
   done
 fi
+
+echo "Build succeeded"
+exit 0