[sr-dev] git:4.3:eebfe60b: travis: remove rebuild twice for MEMDBG test
Victor Seva
linuxmaniac at torreviejawireless.org
Fri Jun 3 13:38:47 CEST 2016
Module: kamailio
Branch: 4.3
Commit: eebfe60b94ed1e35cdb629ca612b13f4135849fc
URL: https://github.com/kamailio/kamailio/commit/eebfe60b94ed1e35cdb629ca612b13f4135849fc
Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: 2016-06-03T13:38:32+02:00
travis: remove rebuild twice for MEMDBG test
(cherry picked from commit eb0d271af95ba0eb409716335d86351ea9e94343)
---
Modified: test/travis/build_travis.sh
---
Diff: https://github.com/kamailio/kamailio/commit/eebfe60b94ed1e35cdb629ca612b13f4135849fc.diff
Patch: https://github.com/kamailio/kamailio/commit/eebfe60b94ed1e35cdb629ca612b13f4135849fc.patch
---
diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh
index 85b9fb2..115ca64 100755
--- a/test/travis/build_travis.sh
+++ b/test/travis/build_travis.sh
@@ -17,13 +17,26 @@ else
rm -rf /code/debian
ln -s /code/pkg/kamailio/deb/"${DIST}" /code/debian
fi
-function build {
+
+function _clean {
echo "make clean"
make -f debian/rules clean
+}
+
+function _build {
echo "make build"
make -f debian/rules build
}
+function _install {
+ if [[ "$CC" =~ gcc ]] ; then
+ echo "make install"
+ make install
+ else
+ echo "skip make install step"
+ fi
+}
+
if [[ "${CC}" =~ clang ]] ; then
CLANG=$(find /usr/bin -type l -name 'clang-[0-9]*' | sort -r | head -1)
echo "setting clang to ${CLANG}"
@@ -33,18 +46,6 @@ fi
echo "environment DIST=$DIST CC=$CC"
${CC} --version
-# build flags
-export MEMDBG=0
-echo "build with MEMDBG=0"
-build
-
-export MEMDBG=1
-echo "build with MEMDBG=1"
-build
-
-if [[ "$CC" =~ gcc ]] ; then
- echo "make install"
- make install
-else
- echo "skip make install step"
-fi
+_clean
+_build
+_install
More information about the sr-dev
mailing list