update ci builds

.travis.yml

@@ -14,29 +14,14 @@ branches:
     - coverity_scan
     - travis
 
-env:
-  global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "KuAAwjiIqkk4vqSX/M3ZZIvQs6edm+tV8IADiklTUYZIFyxu8FgZ6RbDdMD2sef5bNZA1OZhlcbeRtiKff5CfMtvzc607Lg3NUkpi+ShMynWgqS/e0uCMf9ogEJlUiZMxf4juBi7v6DyMl/WV6pAdJmdfHtzcj8GF2mgTfQjkO8="
-
 before_script:
   - sudo modprobe fuse
   - cmake --version
 
 script:
-  - if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then ./build.sh && ./test.sh ; fi
+  - ./ci/check.sh
 
 addons:
-  coverity_scan:
-    project:
-      name: "vgough/encfs"
-      description: "Build submitted via Travis CI"
-    notification_email: vgough@pobox.com
-    build_command_prepend: "make clean"
-    build_command:   "make -j 4"
-    branch_pattern: coverity_scan
-
   apt:
     sources:
       - ubuntu-toolchain-r-test

ci/check.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -eu
+
+if [[ ! -d build ]]
+then
+	mkdir build
+fi
+
+cd build
+cmake ..
+make -j2
+make test
+
+cd ..
+

circle.yml

@@ -10,5 +10,5 @@ dependencies:
 test:
   override:
     - bash ./ci/config.sh
-    - cd build && make && make test && ./checkops && make install
+    - cd build && make && make test && make install
     - /tmp/encfs/bin/encfsctl --version

test/CMakeLists.txt

@@ -6,5 +6,3 @@ add_test(unit unittests)
 file(GLOB_RECURSE BENCH_SOURCES "*_bench.cpp")
 add_executable (benchmarks ${BENCH_SOURCES})
 target_link_libraries(benchmarks benchmark encfs)
-
-add_custom_target(integration COMMAND ${CMAKE_CURRENT_LIST_DIR}/integration.sh)