Add tests to travis build. Some modifications for this

.travis.yml

@@ -14,6 +14,8 @@ before_install:
   - ./ci/update_travis.sh
 
 script:
-  - CXX=clang++ CC=clang ./ci/compile_container.sh
+  - script=compile CXX=clang++ CC=clang ./ci/execute.sh
-  - ./ci/compile_container.sh
+  - script=clean ./ci/execute.sh
-  - ./ci/static_analysis.sh
+  - script=compile ./ci/execute.sh
+  - script=static_analysis ./ci/execute.sh
+  - script=compile make_command="broadwayd & make test" ./ci/execute.sh

ci/compile.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "${cmake_command}" == "" ]; then
-  cmake_command="cmake -DCMAKE_CXX_FLAGS=\"-Werror\" .."
+  cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
 fi
 
 if [ "${make_command}" == "" ]; then

ci/execute.sh

@@ -2,7 +2,10 @@
 
 function linux () {
   cd ci || exit
+  if [ "${script}" == "clean" ]; then
     sudo rm ../build -rf
+    return 0
+  fi
   sudo docker run -it \
     -e "CXX=$CXX" \
     -e "CC=$CC" \
@@ -10,7 +13,7 @@ function linux () {
     -e "cmake_command=$cmake_command" \
     -e "distribution=$distribution" \
     -v "$PWD/../:/jucipp" \
-    --entrypoint="/jucipp/ci/entrypoint.sh" \
+    --entrypoint="/jucipp/ci/${script}.sh" \
     "cppit/jucipp:$distribution"
 }
 

ci/static_analysis.sh

@@ -1,16 +1,8 @@
 #!/bin/bash
 
-function linux () {
+if [ "${make_command}" == "" ]; then
-  cd ci || exit
+  make_command="make -j 2"
-  sudo docker run -it \
+fi
-    -v "${PWD}/../:/jucipp/" \
-    "cppit/jucipp:${distribution}" \
-    sh -c "cd jucipp/build && scan-build -o ../html_${distribution} --status-bugs make"
-}
 
-#TODO should do static analysis on build
+cd jucipp/build || exit
-function osx () {
+exec sh -c "scan-build -o ../html_${distribution} --status-bugs ${make_command}"
-  true
-}
-
-$TRAVIS_OS_NAME