Add script for jenkins CI and fix of issues

jenkinsBuild.sh

@@ -0,0 +1,13 @@
+JK_SRV_WABLE="$HOME/app-root/data"
+
+GTEST_LIB_FOLDER="$JK_SRV_WABLE/usr/local/lib"
+GTEST_INCLUDE_FOLDER="$JK_SRV_WABLE/compilation/googletest/googletest/include"
+
+echo $GTEST_INCLUDE_FOLDER
+
+sh runBuild.sh " \
+-DCONTINUOUS_INTEGRATION_BUILD=ON \
+-DBUILD_LIB_TEST=ON \
+-DGTEST_ROOT=$GTEST_LIB_FOLDER \
+-DGTEST_INCLUDE_DIR=$GTEST_INCLUDE_FOLDER \
+"

liberamox/testing/CMakeLists.txt

@@ -7,13 +7,13 @@ include_directories("${PROJECT_BINARY_DIR}/src")
 # add the sources to the include directive
 include_directories("../lib")
 
-if (BUILD_LIB_TEST) 
+if (BUILD_LIB_TEST)
+	enable_testing()
 	find_package(GTest REQUIRED)
 	include_directories(
-	    ${GTEST_INCLUDE_DIRS}
-	    ${GMOCK_INCLUDE_DIRS}
+	    ${GTEST_INCLUDE_DIR}
 	)
-	
+
 	# add the executable
 	add_executable(${EXECUTABLE_NAME} main.cpp)
 	SET_TARGET_PROPERTIES(${EXECUTABLE_NAME} PROPERTIES LINKER_LANGUAGE CXX)

runTest.sh

@@ -1,27 +1,19 @@
 echo "Starting test"
 
+TEST_EXE="gtestexe"
+REPORT_XML="gtestreport.xml"
+REPORT_FOLDER="../"
+
 # moving to test folder
 cd liberamox/build/testing
 
 # Google test
-if [ $run_gtest -eq 1 ]; then
 echo "Running GTest:"
-./completetestlib
+./$TEST_EXE --gtest_output=xml:$REPORT_FOLDER$REPORT_XML
 res_gtest=$?
-fi
 
 cd -
 echo "Test Finished"
 
 exit $res_gtest
 
-if [ "$1" == "" ]
-then
-	echo "no parameter, executing all";
-	run_gtest=1;
-else
-	if [ "$1" == "--gtest" ]
-	then
-		run_gtest=1;
-fi
-