emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run-tests: set ATF_SHELL=/bin/sh.

Browse Source 
This way 'make check' always uses it.

Signed-off-by: Juan RP <xtraeme@gmail.com>
This commit is contained in:
Juan RP 2019-06-14 10:21:37 +02:00
parent a498e7aee2
commit 53e23d348e
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -15,7 +15,7 @@ env:
install: install:
- docker pull "$IMG" - 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: script:
- echo BUILDS PASSED - echo BUILDS PASSED

2
run-tests
View File

@ -9,7 +9,7 @@ NPROCS=1
if [ -r /proc/cpuinfo ]; then if [ -r /proc/cpuinfo ]; then
NPROCS=$(grep ^proc /proc/cpuinfo|wc -l) NPROCS=$(grep ^proc /proc/cpuinfo|wc -l)
fi 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=$? rv=$?
kyua report --verbose -r result.db kyua report --verbose -r result.db
rm -f result.db rm -f result.db