[ostree: 34/70] libtest.sh: only check whether $(pwd) is empty once
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree: 34/70] libtest.sh: only check whether $(pwd) is empty once
- Date: Fri, 15 Apr 2016 21:04:06 +0000 (UTC)
commit 18e9169d7ae76149833475c14f4c7147f6f91c9e
Author: Simon McVittie <smcv debian org>
Date: Thu Mar 31 17:52:57 2016 +0100
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
tests/libtest.sh | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/tests/libtest.sh b/tests/libtest.sh
index aaa553a..765e987 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -41,8 +41,12 @@ test_tmpdir=$(pwd)
if ! test -f .testtmp; then
files=$(ls)
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"
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
export G_DEBUG=fatal-warnings
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]