diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-07-04 14:42:02 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-07-05 23:41:27 +0000 |
commit | 597f23bdd99e0962a6912231938543b42e6f43ab (patch) | |
tree | 52dad44ceced79bd333f538739b7169fca3a9f1e /.travis | |
parent | 8739f7fccb7cafc54ca0f5fa074c9a740f7048ba (diff) |
Use run_auto_test.h test fixture for some auto-tests.
Most of the auto-tests should use this fixture, but I've only done a few
to set an example.
Diffstat (limited to '.travis')
-rwxr-xr-x | .travis/cmake-linux | 3 | ||||
-rwxr-xr-x | .travis/cmake-osx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis/cmake-linux b/.travis/cmake-linux index e3517a09..e5874c19 100755 --- a/.travis/cmake-linux +++ b/.travis/cmake-linux | |||
@@ -62,7 +62,8 @@ travis_script() { | |||
62 | 62 | ||
63 | cd _build # pushd | 63 | cd _build # pushd |
64 | make "-j$NPROC" -k install | 64 | make "-j$NPROC" -k install |
65 | make "-j$NPROC" test ARGS="-j50" CTEST_OUTPUT_ON_FAILURE=1 | 65 | make "-j$NPROC" test ARGS="-j50" || \ |
66 | make "-j$NPROC" test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE=1 | ||
66 | cd - # popd | 67 | cd - # popd |
67 | 68 | ||
68 | other/astyle/format-source . "$ASTYLE" | 69 | other/astyle/format-source . "$ASTYLE" |
diff --git a/.travis/cmake-osx b/.travis/cmake-osx index 529a2309..524f7116 100755 --- a/.travis/cmake-osx +++ b/.travis/cmake-osx | |||
@@ -35,7 +35,8 @@ travis_script() { | |||
35 | 35 | ||
36 | cd _build # pushd | 36 | cd _build # pushd |
37 | make "-j$NPROC" -k install | 37 | make "-j$NPROC" -k install |
38 | make "-j$NPROC" test ARGS="-j50" CTEST_OUTPUT_ON_FAILURE=1 | 38 | make "-j$NPROC" test ARGS="-j50" || \ |
39 | make "-j$NPROC" test ARGS="-j50 --rerun-failed" CTEST_OUTPUT_ON_FAILURE=1 | ||
39 | cd - # popd | 40 | cd - # popd |
40 | } | 41 | } |
41 | 42 | ||