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

libtest.sh: only check whether $(pwd) is empty once 

test-sysroot.js runs libtestExec() twice, one of which is after
creating non-hidden directories in $(pwd), so this check needs to be
skipped the second time.

Signed-off-by: Simon McVittie <smcv@debian.org>

Closes: #234
Approved by: cgwalters
This commit is contained in:
Simon McVittie 2016-03-31 17:52:57 +01:00 committed by Colin Walters (automation)
parent 9c4babf316
commit 18e9169d7a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/libtest.sh
View File

@ -41,8 +41,12 @@ test_tmpdir=$(pwd)
if ! test -f .testtmp; then if ! test -f .testtmp; then
files=$(ls) files=$(ls)
if test -n "${files}"; then if test -n "${files}"; then
ls -l
assert_not_reached "test tmpdir=${test_tmpdir} is not empty; run this test via \`make check TESTS=\`, not directly" assert_not_reached "test tmpdir=${test_tmpdir} is not empty; run this test via \`make check TESTS=\`, not directly"
fi fi
# Remember that this is an acceptable test $(pwd), for the benefit of
# C and JS tests which may source this file again
touch .testtmp
fi fi
export G_DEBUG=fatal-warnings export G_DEBUG=fatal-warnings