projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Test harness sync" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
build.sh
diff --git
a/automated-tests/build.sh
b/automated-tests/build.sh
index
6c817ae
..
7e812e1
100755
(executable)
--- a/
automated-tests/build.sh
+++ b/
automated-tests/build.sh
@@
-1,6
+1,7
@@
#!/bin/bash
#!/bin/bash
-TEMP=`getopt -o rn --long rebuild,no-gen \
+
+TEMP=`getopt -o r --long rebuild \
-n 'genmake' -- "$@"`
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
-n 'genmake' -- "$@"`
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@
-9,12
+10,10
@@
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
eval set -- "$TEMP"
opt_rebuild=false
eval set -- "$TEMP"
opt_rebuild=false
-opt_generate=true
while true ; do
case "$1" in
-r|--rebuild) opt_rebuild=true ; shift ;;
while true ; do
case "$1" in
-r|--rebuild) opt_rebuild=true ; shift ;;
- -n|--no-gen) opt_generate=false ; shift ;;
--) shift ; break ;;
*) shift ;; # Ignore
esac
--) shift ; break ;;
*) shift ;; # Ignore
esac
@@
-27,10
+26,6
@@
fi
function build
{
function build
{
- if [ $opt_generate == true -o $opt_rebuild == false ] ; then
- (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 )
}
(cd build ; cmake .. -DMODULE=$1 ; make -j7 )
}
@@
-43,6
+38,10
@@
else
if [ $mod != 'common' ] && [ $mod != 'manual' ]; then
echo BUILDING $mod
build $mod
if [ $mod != 'common' ] && [ $mod != 'manual' ]; then
echo BUILDING $mod
build $mod
+ if [ $? -ne 0 ]; then echo "Build failed" ; exit 1; fi
fi
done
fi
fi
done
fi
+
+echo "Build succeeded"
+exit 0