From 53e23d348e929781581b6882f9f85837fdb2167f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 14 Jun 2019 10:21:37 +0200 Subject: [PATCH] run-tests: set ATF_SHELL=/bin/sh. This way 'make check' always uses it. Signed-off-by: Juan RP --- .travis.yml | 2 +- run-tests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b3d80d6..54514cef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: install: - docker pull "$IMG" - - docker run -v "$PWD":/tmp/build-dir -w "/tmp/build-dir" "$IMG" /bin/sh -c "xbps-install -Syu && xbps-install -y $DEPS make pkg-config kyua zlib-devel libarchive-devel atf-devel && CC=$CC ./configure --enable-tests && make -j$(nproc) && ATF_SHELL=/bin/sh make check" + - docker run -v "$PWD":/tmp/build-dir -w "/tmp/build-dir" "$IMG" /bin/sh -c "xbps-install -Syu && xbps-install -y $DEPS make pkg-config kyua zlib-devel libarchive-devel atf-devel && CC=$CC ./configure --enable-tests && make -j$(nproc) && make check" script: - echo BUILDS PASSED diff --git a/run-tests b/run-tests index 350227a4..cbe84551 100755 --- a/run-tests +++ b/run-tests @@ -9,7 +9,7 @@ NPROCS=1 if [ -r /proc/cpuinfo ]; then NPROCS=$(grep ^proc /proc/cpuinfo|wc -l) fi -LD_LIBRARY_PATH=$PWD/lib kyua --variable parallelism=$NPROCS test -r result.db -k tests/xbps/Kyuafile +LD_LIBRARY_PATH=$PWD/lib ATF_SHELL=/bin/sh kyua --variable parallelism=$NPROCS test -r result.db -k tests/xbps/Kyuafile rv=$? kyua report --verbose -r result.db rm -f result.db