[sr-dev] git:master:eb0d271a: travis: remove rebuild twice for MEMDBG test

Victor Seva linuxmaniac at torreviejawireless.org
Fri Jun 3 11:30:57 CEST 2016


Module: kamailio
Branch: master
Commit: eb0d271af95ba0eb409716335d86351ea9e94343
URL: https://github.com/kamailio/kamailio/commit/eb0d271af95ba0eb409716335d86351ea9e94343

Author: Victor Seva <linuxmaniac at torreviejawireless.org>
Committer: Victor Seva <linuxmaniac at torreviejawireless.org>
Date: 2016-06-03T11:17:07+02:00

travis: remove rebuild twice for MEMDBG test

---

Modified: test/travis/build_travis.sh

---

Diff:  https://github.com/kamailio/kamailio/commit/eb0d271af95ba0eb409716335d86351ea9e94343.diff
Patch: https://github.com/kamailio/kamailio/commit/eb0d271af95ba0eb409716335d86351ea9e94343.patch

---

diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh
index 1d0944e..44a0ffe 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