From 2ed1dcfa30b3967f7d6df74fba78ce23ed065497 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 15 Jun 2024 11:41:35 +0200 Subject: Merging upstream version 5.6.2. Signed-off-by: Daniel Baumann --- tests/test_scripts.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'tests/test_scripts.sh') diff --git a/tests/test_scripts.sh b/tests/test_scripts.sh index ee82361..ca9600e 100755 --- a/tests/test_scripts.sh +++ b/tests/test_scripts.sh @@ -1,18 +1,18 @@ #!/bin/sh +# SPDX-License-Identifier: 0BSD ############################################################################### # # Author: Jonathan Nieder # -# This file has been put into the public domain. -# You can do whatever you want with this file. -# ############################################################################### # If scripts weren't built, this test is skipped. -XZ=../src/xz/xz -XZDIFF=../src/scripts/xzdiff -XZGREP=../src/scripts/xzgrep +# When this is run from CMake, $1 is a relative path +# to the directory with the executables and the scripts. +XZ=${1:-../src/xz}/xz +XZDIFF=${1:-../src/scripts}/xzdiff +XZGREP=${1:-../src/scripts}/xzgrep for i in XZ XZDIFF XZGREP; do eval test -x "\$$i" && continue @@ -23,14 +23,15 @@ done # Installing the scripts in this case is a bit silly but they # could still be used with other decompression tools so configure # doesn't automatically disable scripts if decoders are disabled. -if grep 'define HAVE_DECODERS' ../config.h > /dev/null ; then +if test ! -f ../config.h \ + || grep 'define HAVE_DECODERS' ../config.h > /dev/null ; then : else echo "Decompression support is disabled, skipping this test." exit 77 fi -PATH=`pwd`/../src/xz:$PATH +PATH=`pwd`/${1:-../src/xz}:$PATH export PATH test -z "$srcdir" && srcdir=. -- cgit v1.2.3