Skip to content

Commit 0831b83

Browse files
Revert runtest code to handle read only source tree until it work
This reverts c6b7362 and 10bf44e which provded to not work in all cases.
1 parent a0af426 commit 0831b83

1 file changed

Lines changed: 8 additions & 14 deletions

File tree

scripts/runtests.in

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ unset DISPLAY
1313
export LC_ALL=C
1414
export LANGUAGES=
1515

16+
1617
case "$0" in
1718
*/*) MYDIR="${0%/*}" ;;
1819
*) MYDIR="`type -path $0`"; MYDIR="${MYDIR%/*}"
@@ -124,32 +125,25 @@ run_tests () {
124125
| sort > $TMPDIR/alltests
125126

126127
while read testname; do
127-
# Copy test to writable directory
128-
srctestdir=$(dirname $testname)
129-
if [ -e $TMPDIR/curtest ] ; then rm -rf $TMPDIR/curtest; fi
130-
mkdir $TMPDIR/curtest
131-
cp -rL $srctestdir/. $TMPDIR/curtest
132-
testdir=$TMPDIR/curtest
128+
testdir=$(dirname $testname)
133129
if [ -e $testdir/skip ]; then
134130
if ! [ -x $testdir/skip ] || ! $testdir/skip; then
135-
echo "Skipping disabled test: $srctestdir" 1>&2
131+
echo "Skipping disabled test: $testdir" 1>&2
136132
SKIP=$(($SKIP+1))
137-
rm -rf $TMPDIR/curtest
138133
continue
139134
fi
140135
fi
141136
if $NOSUDO && [ -e $testdir/control ] && \
142137
grep Restrictions: $testdir/control | grep -q sudo; then
143138
if ! [ -x $testdir/skip ] || ! $testdir/skip; then
144-
echo "Skipping sudo test: $srctestdir" 1>&2
139+
echo "Skipping sudo test: $testdir" 1>&2
145140
SKIP=$(($SKIP+1))
146-
rm -rf $TMPDIR/curtest
147141
continue
148142
fi
149143
fi
150144
NUM=$(($NUM+1))
151145
export TEST_DIR=$(readlink -f $testdir)
152-
echo "Running test: $srctestdir" 1>&2
146+
echo "Running test: $testdir" 1>&2
153147
if test -n "$SYSTEM_BUILD"; then
154148
# Tell `halcompile` where to install comps
155149
USER_MODULE_DIR=$(readlink -f $testdir) \
@@ -187,7 +181,7 @@ run_tests () {
187181
fi
188182
fi
189183
if [ $exitcode -ne 0 ]; then
190-
echo "*** $srctestdir: XFAIL: $reason"
184+
echo "*** $testdir: XFAIL: $reason"
191185
if test $PRINT = 1; then
192186
echo "************** result:"
193187
tail -500 $testdir/result | sed 's/^/ /'
@@ -204,14 +198,14 @@ run_tests () {
204198
else
205199
FAIL=$(($FAIL+1))
206200
FAIL_NAMES="$FAIL_NAMES
207-
$srctestdir"
201+
$testdir"
208202
fi
209203
if test $STOP = 1; then
210204
break
211205
fi
212206
else
213207
if [ -f $testdir/xfail ]; then
214-
echo "*** $srctestdir: XPASS: Passed, but was expected to fail"
208+
echo "*** $testdir: XPASS: Passed, but was expected to fail"
215209
else
216210
if [ $NOCLEAN -eq 0 ]; then
217211
rm -f $testdir/stderr $testdir/result \

0 commit comments

Comments
 (0)