summaryrefslogtreecommitdiff
path: root/.travis
diff options
context:
space:
mode:
authoriphydf <iphydf@users.noreply.github.com>2018-07-12 20:56:22 +0000
committeriphydf <iphydf@users.noreply.github.com>2018-07-12 21:15:51 +0000
commit2377cac94ba801f4b6363f23490dfdbcc332a8ad (patch)
tree107138063e36bc7f067ce14df88a4541d54ab0d1 /.travis
parentbeeb9b4335d9ca6f947a52528453753a51f194f3 (diff)
Use named function types for group callbacks.
Also some other cleanups. This PR means that future PRs, i.e. the PGC PR, must not break the rules established here.
Diffstat (limited to '.travis')
-rwxr-xr-x.travis/cmake-linux4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis/cmake-linux b/.travis/cmake-linux
index e5874c19..48b72925 100755
--- a/.travis/cmake-linux
+++ b/.travis/cmake-linux
@@ -48,6 +48,8 @@ travis_script() {
48 # Coverage flags. 48 # Coverage flags.
49 add_flag -fprofile-arcs -ftest-coverage 49 add_flag -fprofile-arcs -ftest-coverage
50 50
51 other/astyle/format-source . "$ASTYLE"
52
51 cmake -B_build -H. \ 53 cmake -B_build -H. \
52 -DCMAKE_C_FLAGS="$C_FLAGS" \ 54 -DCMAKE_C_FLAGS="$C_FLAGS" \
53 -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \ 55 -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
@@ -65,8 +67,6 @@ travis_script() {
65 make "-j$NPROC" test ARGS="-j50" || \ 67 make "-j$NPROC" test ARGS="-j50" || \
66 make "-j$NPROC" test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE=1 68 make "-j$NPROC" test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE=1
67 cd - # popd 69 cd - # popd
68
69 other/astyle/format-source . "$ASTYLE"
70} 70}
71 71
72if [ "-z" "$ACTION" ]; then 72if [ "-z" "$ACTION" ]; then