Explorar el Código

travis: remove rebuild twice for MEMDBG test

Victor Seva hace 9 años
padre
commit
eb0d271af9
Se han modificado 1 ficheros con 17 adiciones y 16 borrados
  1. 17 16
      test/travis/build_travis.sh

+ 17 - 16
test/travis/build_travis.sh

@@ -17,13 +17,26 @@ else
 	rm -rf /code/debian
 	rm -rf /code/debian
 	ln -s /code/pkg/kamailio/deb/"${DIST}" /code/debian
 	ln -s /code/pkg/kamailio/deb/"${DIST}" /code/debian
 fi
 fi
-function build {
+
+function _clean {
 	echo "make clean"
 	echo "make clean"
 	make -f debian/rules clean
 	make -f debian/rules clean
+}
+
+function _build {
 	echo "make build"
 	echo "make build"
 	make -f debian/rules 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
 if [[ "${CC}" =~ clang ]] ; then
 	CLANG=$(find /usr/bin -type l -name 'clang-[0-9]*' | sort -r | head -1)
 	CLANG=$(find /usr/bin -type l -name 'clang-[0-9]*' | sort -r | head -1)
 	echo "setting clang to ${CLANG}"
 	echo "setting clang to ${CLANG}"
@@ -33,18 +46,6 @@ fi
 echo "environment DIST=$DIST CC=$CC"
 echo "environment DIST=$DIST CC=$CC"
 ${CC} --version
 ${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