Merge pull request #80 from njoy/feature/signature

Feature/signature

Author: jlconlin

.travis.yml

@@ -1,5 +1,4 @@
 sudo: required
-dist: trusty
 git:
   submodules: false
 addons:
@@ -8,29 +7,33 @@ addons:
     - sourceline: deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main
       key_url: http://apt.llvm.org/llvm-snapshot.gpg.key
     - ubuntu-toolchain-r-test
-    - george-edison55-precise-backports
     packages:
     - gcc-6
     - g++-6
     - gfortran-6
     - clang-3.8
     - llvm-dev
     - libc++-dev
-    - cmake
-    - cmake-data
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then 
+      brew update  > /dev/null;
+      brew install gcc || true;
+      brew link --overwrite gcc;
+      brew upgrade python3;
+    fi
 language: cpp
 compiler:
-- gcc
-- clang
+  - gcc
+  - clang
 os:
-- linux
-- osx
-osx_image: xcode8
-before_install:
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc; fi
+  - linux
+  - osx
+
+osx_image: xcode9
+
 script: "./.travis/build.sh"
 after_success: "./.travis/signature.sh"
+
 env:
   matrix:
   - build_type=debug static_libraries=FALSE
@@ -39,14 +42,23 @@ env:
   - build_type=release static_libraries=TRUE
   global:
     secure: plUDJs3n7DrcEKGTQLVDQGWvOkPNLzR5vES9wxg6LkvwiMsIwYtEcwbKgjn3SRqQL9+iGVImRRR8nuOYLRVX+XQU1863QXmg74zOtjXfdux9/ArHyiJAsiQRgngCK+6s9mUpP9KpeSIso1yaFOMFC6VPbxGBDL11I1SbTbbgL46dcLdgDCf1NcJS88e049nZdW9c7qU5ZnnzY0wtY0w3DeG6Kv+ryybYOBUZcWf/Ax9vzG7Zr+iQa8SldwW6wN/FFk/Xu2akpkLDiJpBIBwoZkhtoFRkJyFFhHXzf+ZBsYFHf4ZZA2ckLkDF/A+f+CgTYfxJpKykfC7NRGgqiykOeJ4qGf0s/tKGCID6X1JQzDchmEQ7N7GitdUcepSy9F+m79LESpot2CyfQA2XW8VF8IcW9PnttEQ44m9QsZyesUID6FHTPv25a2SUclYPfaUR9ctlJJ6YWWSl+i2qQVBt/TKCVLhxAmc9norHe7d+OqFi/Ksmxz3AGLzqxS52W6U5HMDhz/Ha5N6yUhifNf7Nm2ALMQrmD1Ixh3WBShPBiXXUCe19CjcMUafQ30SFIdt7W6UFv9v0yTLpK7m0b9MyO/sH2bpKzLtLSwoGF4xeai75FyuX/sy48Kshs9+p2u7wL7mD/KPjwI8YKm42u0y3x3N2Ma3k5xZOKGLR9tBlX34=
+
 matrix:
   include:
   - os: linux
     compiler: gcc
-    env: build_type=coverage static_libraries=FALSE
+    env:
+      build_type=coverage
+      static_libraries=FALSE
   - os: linux
     compiler: clang
-    env: build_type=debug static_libraries=FALSE appended_flags="-fsanitize=address;-fno-omit-frame-pointer;"
+    env:
+      build_type=debug
+      static_libraries=FALSE
+      appended_flags="-fsanitize=address;-fno-omit-frame-pointer;"
   - os: linux
     compiler: clang
-    env: build_type=debug static_libraries=FALSE appended_flags="-fsanitize=undefined;-fno-omit-frame-pointer;"
+    env:
+      build_type=debug
+      static_libraries=FALSE
+      appended_flags="-fsanitize=undefined;-fsanitize=integer;-fno-omit-frame-pointer;"

.travis/build.sh

@@ -1,14 +1,6 @@
 #!/bin/bash
 set -x
 
-function repeat {
-    while true
-    do
-        sleep $1
-        ${@:2}
-    done
-}
-       
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
   sudo update-alternatives \
     --install /usr/bin/gcc gcc /usr/bin/gcc-6 90 \
@@ -31,7 +23,6 @@ else
   export NPROC=$(sysctl -n hw.physicalcpu)
 fi
 
-
 if [ "$build_type" = "coverage" ]; then
   export build_type=DEBUG
   export coverage=true
@@ -45,58 +36,25 @@ cd build
 
 cmake -D CMAKE_BUILD_TYPE=$build_type \
       -D static_libraries=$static_libraries \
-      -D NJOY21_appended_flags="$appended_flags" \
-      $CUSTOM .. &> configuration.txt
-export CONFIGURATION_FAILURE=$?
-
-if [ $CONFIGURATION_FAILURE -ne 0 ];
-then
-  echo "failed while configuring"
-  cat configuration.txt
-  exit 1
-fi
-rm configuration.txt
-
-repeat 300 echo "Still building..."&
-export EKG=$!
-       
-make VERBOSE=1 -j$NPROC &> compilation.txt
+      -D njoy21_appended_flags="$appended_flags" \
+      $CUSTOM ..
+make VERBOSE=1 -j$NPROC
 export COMPILATION_FAILURE=$?
 
 if [ $COMPILATION_FAILURE -ne 0 ];
 then
-  echo "failed while compiling"
-  cat compilation.txt  
   exit 1
 fi
-rm compilation.txt
 
-kill $EKG
-
-ctest --output-on-failure -j$NPROC &> testing.txt
+ctest --output-on-failure -j$NPROC
 export TEST_FAILURE=$?
 if [ $TEST_FAILURE -ne 0 ];
 then
-    echo "failed while testing"
-    cat testing.txt  
     exit 1
 fi
-rm testing.txt
 
 if $coverage; then
-  wget http://downloads.sourceforge.net/ltp/lcov-1.13.tar.gz
-  tar xvfz lcov-1.11.tar.gz;
-  make -C lcov-1.13
-  export PATH=$(pwd)/lcov-1.11/bin/:$PATH
-  lcov --capture \
-       --directory . \
-       --base-directory ../src/njoy21 \
-       --output-file coverage.info
-  lcov --extract coverage.info "*njoy21*" \
-       --output-file coverage.info
-  lcov --remove coverage.info "*test*" \
-       --output-file coverage.info
-  bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
+  pip install --user cpp-coveralls
+  echo "loading coverage information"
+  coveralls  --exclude-pattern "/usr/include/.*|.*/CMakeFiles/.*|.*subprojects.*|.*dependencies.*|.*test\.cpp" --root ".." --build-root "." --gcov-options '\-lp'
 fi
-
-exit 0