packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/test-cli-extensions: Fix with single-binary coreutils 

On systems where `coreutils` are built with `--enable-single-binary=symlinks` like Nix,
`/usr/bin/env` is symlinked to `/usr/bin/coreutils` and uses `argv[0]` to determine which program to run.
Since the `test-cli-extensions.sh` created a new symlink named `ostree-env`,
coreutils would be confused about the utility to choose, so running it would fail:

	ostree-env: unknown program ‘ostree-env’
	Try 'ostree-env --help' for more information.

Fixes: https://github.com/ostreedev/ostree/issues/2553
This commit is contained in:
Jan Tojnar 2022-03-26 10:50:45 +01:00
parent 574d35bbdf
commit 1898019fac
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test-cli-extensions.sh
View File

@ -15,7 +15,9 @@ echo '1..2'
mkdir -p ./localbin mkdir -p ./localbin
ORIG_PATH="${PATH}" ORIG_PATH="${PATH}"
export PATH="./localbin/:${PATH}" export PATH="./localbin/:${PATH}"
ln -s /usr/bin/env ./localbin/ostree-env echo '#!/bin/sh' >> ./localbin/ostree-env
echo 'env "$@"' >> ./localbin/ostree-env
chmod +x ./localbin/ostree-env
export A_CUSTOM_TEST_FLAG="myvalue" export A_CUSTOM_TEST_FLAG="myvalue"
${CMD_PREFIX} ostree env >out.txt ${CMD_PREFIX} ostree env >out.txt
assert_file_has_content out.txt "^A_CUSTOM_TEST_FLAG=myvalue" assert_file_has_content out.txt "^A_CUSTOM_TEST_FLAG=myvalue"