@@ -19,17 +19,17 @@ matrix:
1919 packages :
2020 - g++-6
2121 env :
22- - COMPILER=g++-6 C_COMPILER=gcc-6 COMPILER_ID =gcc
22+ - COMPILER=g++-6 C_COMPILER=gcc-6 STEP =gcc
2323 - compiler : clang
2424 addons :
2525 apt :
2626 sources :
27- - ubuntu-toolchain-r-test
2827 - llvm-toolchain-trusty-6.0
28+ - ubuntu-toolchain-r-test
2929 packages :
3030 - clang-6.0
3131 env :
32- - COMPILER=clang++-6.0 C_COMPILER=clang-6.0 COMPILER_ID =clang
32+ - COMPILER=clang++-6.0 C_COMPILER=clang-6.0 STEP =clang
3333 - compiler : clang-tidy
3434 addons :
3535 apt :
@@ -40,13 +40,22 @@ matrix:
4040 - clang-tidy-6.0
4141 - clang-6.0
4242 env :
43- - COMPILER=clang++-6.0 C_COMPILER=clang-6.0 COMPILER_ID =clang-tidy
43+ - COMPILER=clang++-6.0 C_COMPILER=clang-6.0 STEP =clang-tidy
4444
4545install :
46+ - export "SOURCE_ROOT=${TRAVIS_BUILD_DIR}" "BUILD_ROOT=${TRAVIS_BUILD_DIR}/build"
4647 - export "CXX=$COMPILER";
47- - whereis run-clang-tidy.py;
48+
49+ before_script :
50+ - mkdir -p ${BUILD_ROOT} && cd ${BUILD_ROOT}
4851
4952script :
50- - if [[ "$COMPILER_ID" == "clang" ]]; then (pwd && ./configure.sh -c -t && cd ./build && make -j8 && ./TaskManager-tester); fi
51- - if [[ "$COMPILER_ID" == "gcc" ]]; then (pwd && ./configure.sh -t && cd ./build && make -j8 && ./TaskManager-tester); fi
52- - if [[ "$COMPILER_ID" == "clang-tidy" ]]; then (pwd && ./configure.sh -c -y && cd ./build && make -j8 && make clang-tidy); fi
53+ - if [[ "$STEP" == "clang" ]]; then
54+ (../configure.sh -c -t && make -j8 && ./TaskManager-tester);
55+ fi
56+ - if [[ "$STEP" == "gcc" ]]; then
57+ (../configure.sh -t && make -j8 && ./TaskManager-tester);
58+ fi
59+ - if [[ "$STEP" == "clang-tidy" ]]; then
60+ (../configure.sh -c -y && make -j8 && make clang-tidy);
61+ fi
0 commit comments