Merge pull request #2158 from facebook/meson_fix

fix meson playTests.sh
facebook · May 21, 2020 · 9fdf5da · 9fdf5da
2 parents a63810e + 26b21e4
commit 9fdf5da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -243,7 +243,7 @@ matrix:
         - bash tests/libzstd_partial_builds.sh
 
     # meson dedicated test
-    - name: Xenial (Meson + clang)    # ~8mn
+    - name: Xenial (Meson + clang)    # ~15mn
       if: branch = master
       dist: xenial
       language: cpp

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

diff --git a/tests/playTests.sh b/tests/playTests.sh
@@ -123,10 +123,10 @@ case "$UNAME" in
   SunOS) DIFF="gdiff" ;;
 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 "$DATAGEN_BIN" ] || die "$DATAGEN_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!"
 
 if echo hello | zstd -v -T2 2>&1 > $INTOVOID | grep -q 'multi-threading is disabled'
 then