| Message ID | 20170616161334.7492-4-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > having the command to run in the variable make scripts harder to > manage. I'm not sure this adds much over the TEST_CMD not set == don't run we had before. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > > using 0/1 or no/yes is pretty much the same. > > .travis.yml | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index b2c69fdd59..c9ac741afc 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -46,7 +46,7 @@ notifications: > env: > global: > - PARALLEL_JOBS="$(($(getconf _NPROCESSORS_ONLN) + 1))" > - - TEST_CMD="make check" > + - RUN_TESTS="yes" > matrix: > - CONFIG="" > - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log" > @@ -66,7 +66,7 @@ before_script: > - ./configure ${CONFIG} > script: > - make -j${PARALLEL_JOBS} > - - test -z "${TEST_CMD}" || ${TEST_CMD} > + - if [ "${RUN_TESTS}" == "yes" ]; then make check; fi > matrix: > include: > # Test with CLang for compile portability > @@ -77,16 +77,16 @@ matrix: > compiler: gcc > # We manually include builds which we disable "make check" for > - env: CONFIG="--enable-debug --enable-tcg-interpreter" > - TEST_CMD="" > + RUN_TESTS="no" > compiler: gcc > - env: CONFIG="--enable-trace-backends=simple" > - TEST_CMD="" > + RUN_TESTS="no" > compiler: gcc > - env: CONFIG="--enable-trace-backends=ftrace" > - TEST_CMD="" > + RUN_TESTS="no" > compiler: gcc > - env: CONFIG="--enable-trace-backends=ust" > - TEST_CMD="" > + RUN_TESTS="no" > compiler: gcc > - env: CONFIG="" > os: osx > @@ -191,6 +191,6 @@ matrix: > env: > - COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5 > - CONFIG="--cc=gcc-5 --cxx=g++-5 --disable-pie --disable-linux-user" > - - TEST_CMD="" > + - RUN_TESTS="no" > before_script: > - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || cat config.log -- Alex Bennée
On 06/17/2017 05:06 AM, Alex Bennée wrote: > > Philippe Mathieu-Daudé <f4bug@amsat.org> writes: > >> having the command to run in the variable make scripts harder to >> manage. > > I'm not sure this adds much over the TEST_CMD not set == don't run we > had before. I don't like it neither but had trouble expanding commands in $TEST_CMD. Anyway I drop this approach in the next version of this series. > >> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> >> using 0/1 or no/yes is pretty much the same. >> >> .travis.yml | 14 +++++++------- >> 1 file changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/.travis.yml b/.travis.yml >> index b2c69fdd59..c9ac741afc 100644 >> --- a/.travis.yml >> +++ b/.travis.yml >> @@ -46,7 +46,7 @@ notifications: >> env: >> global: >> - PARALLEL_JOBS="$(($(getconf _NPROCESSORS_ONLN) + 1))" >> - - TEST_CMD="make check" >> + - RUN_TESTS="yes" >> matrix: >> - CONFIG="" >> - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log" >> @@ -66,7 +66,7 @@ before_script: >> - ./configure ${CONFIG} >> script: >> - make -j${PARALLEL_JOBS} >> - - test -z "${TEST_CMD}" || ${TEST_CMD} >> + - if [ "${RUN_TESTS}" == "yes" ]; then make check; fi >> matrix: >> include: >> # Test with CLang for compile portability >> @@ -77,16 +77,16 @@ matrix: >> compiler: gcc >> # We manually include builds which we disable "make check" for >> - env: CONFIG="--enable-debug --enable-tcg-interpreter" >> - TEST_CMD="" >> + RUN_TESTS="no" >> compiler: gcc >> - env: CONFIG="--enable-trace-backends=simple" >> - TEST_CMD="" >> + RUN_TESTS="no" >> compiler: gcc >> - env: CONFIG="--enable-trace-backends=ftrace" >> - TEST_CMD="" >> + RUN_TESTS="no" >> compiler: gcc >> - env: CONFIG="--enable-trace-backends=ust" >> - TEST_CMD="" >> + RUN_TESTS="no" >> compiler: gcc >> - env: CONFIG="" >> os: osx >> @@ -191,6 +191,6 @@ matrix: >> env: >> - COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5 >> - CONFIG="--cc=gcc-5 --cxx=g++-5 --disable-pie --disable-linux-user" >> - - TEST_CMD="" >> + - RUN_TESTS="no" >> before_script: >> - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || cat config.log > > > -- > Alex Bennée >
diff --git a/.travis.yml b/.travis.yml index b2c69fdd59..c9ac741afc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ notifications: env: global: - PARALLEL_JOBS="$(($(getconf _NPROCESSORS_ONLN) + 1))" - - TEST_CMD="make check" + - RUN_TESTS="yes" matrix: - CONFIG="" - CONFIG="--enable-debug --enable-debug-tcg --enable-trace-backends=log" @@ -66,7 +66,7 @@ before_script: - ./configure ${CONFIG} script: - make -j${PARALLEL_JOBS} - - test -z "${TEST_CMD}" || ${TEST_CMD} + - if [ "${RUN_TESTS}" == "yes" ]; then make check; fi matrix: include: # Test with CLang for compile portability @@ -77,16 +77,16 @@ matrix: compiler: gcc # We manually include builds which we disable "make check" for - env: CONFIG="--enable-debug --enable-tcg-interpreter" - TEST_CMD="" + RUN_TESTS="no" compiler: gcc - env: CONFIG="--enable-trace-backends=simple" - TEST_CMD="" + RUN_TESTS="no" compiler: gcc - env: CONFIG="--enable-trace-backends=ftrace" - TEST_CMD="" + RUN_TESTS="no" compiler: gcc - env: CONFIG="--enable-trace-backends=ust" - TEST_CMD="" + RUN_TESTS="no" compiler: gcc - env: CONFIG="" os: osx @@ -191,6 +191,6 @@ matrix: env: - COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5 - CONFIG="--cc=gcc-5 --cxx=g++-5 --disable-pie --disable-linux-user" - - TEST_CMD="" + - RUN_TESTS="no" before_script: - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || cat config.log
having the command to run in the variable make scripts harder to manage. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- using 0/1 or no/yes is pretty much the same. .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)