facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2158 from facebook/meson_fix

Browse Source 
fix meson playTests.sh
This commit is contained in:
Yann Collet 2020-05-21 16:07:56 -07:00 committed by GitHub
commit 9fdf5daef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -243,7 +243,7 @@ matrix:
- bash tests/libzstd_partial_builds.sh - bash tests/libzstd_partial_builds.sh
# meson dedicated test # meson dedicated test
- name: Xenial (Meson + clang) # ~8mn - name: Xenial (Meson + clang) # ~15mn
if: branch = master if: branch = master
dist: xenial dist: xenial
language: cpp language: cpp

2
build/meson/tests/meson.build
View File

@ -158,7 +158,7 @@ if host_machine_os != os_windows
test('test-zstd', test('test-zstd',
playTests_sh, playTests_sh,
args: ZSTDRTTEST, args: ZSTDRTTEST,
env: ['ZSTD=' + zstd.full_path()], env: ['ZSTD_BIN=' + zstd.full_path(), 'DATAGEN_BIN=./datagen'],
depends: [datagen], depends: [datagen],
workdir: meson.current_build_dir(), workdir: meson.current_build_dir(),
timeout: 2800) # Timeout should work on HDD drive timeout: 2800) # Timeout should work on HDD drive

6
tests/playTests.sh
View File

@ -123,10 +123,10 @@ case "$UNAME" in
SunOS) DIFF="gdiff" ;; SunOS) DIFF="gdiff" ;;
esac esac
println "\nStarting playTests.sh isWindows=$isWindows EXE_PREFIX='$EXE_PREFIX' ZSTD_BIN='$ZSTD_BIN'" println "\nStarting playTests.sh isWindows=$isWindows EXE_PREFIX='$EXE_PREFIX' ZSTD_BIN='$ZSTD_BIN' DATAGEN_BIN='$DATAGEN_BIN'"
[ -n "$ZSTD_BIN" ] || die "$ZSTD_BIN variable must be defined!" [ -n "$ZSTD_BIN" ] || die "\$ZSTD_BIN variable must be defined!"
[ -n "$DATAGEN_BIN" ] || die "$DATAGEN_BIN variable must be defined!" [ -n "$DATAGEN_BIN" ] || die "\$DATAGEN_BIN variable must be defined!"
if echo hello | zstd -v -T2 2>&1 > $INTOVOID | grep -q 'multi-threading is disabled' if echo hello | zstd -v -T2 2>&1 > $INTOVOID | grep -q 'multi-threading is disabled'
then then