On 16.05.2014 09:54, Fam Zheng wrote:
On Fri, 05/16 00:26, Max Reitz wrote:
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index bd66630..9968db9 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -287,10 +287,17 @@ do
start=`_wallclock`
$timestamp && echo -n " ["`date "+%T"`"]"
+
+ if [ "$(head -n 1 "$source_iotests/$seq")" == "#!/usr/bin/env python"
]; then
+ run_command="$PYTHON $seq"
+ else
+ [ ! -x "$source_iotests/$seq" ] && chmod u+x
"$source_iotests/$seq" # ensure we can run it
No, I don't think we need chmod here, to change source tree. If the mode has no
x bit, we need a git commit to fix it.
This is in fact due to a mistake of mine when splitting the commits. In
patch 1, there is a hunk with:
- [ ! -x $seq ] && chmod u+x $seq # ensure we can run it
This should actually be part of this patch instead, so it is
preexisting. However, you are right in that we should probably not do
this, especially not for out-of-tree builds. I'll drop it from v2, if
there are no objections.
Max
Fam
+ run_command="./$seq"
+ fi
export OUTPUT_DIR="$PWD"
(cd "$source_iotests";
MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(($RANDOM % 255 + 1))} \
- ./$seq >$tmp.out 2>&1)
+ $run_command >$tmp.out 2>&1)
sts=$?
$timestamp && _timestamp
stop=`_wallclock`
--
1.9.2
