From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoJRY-0004BT-2r for qemu-devel@nongnu.org; Sat, 24 May 2014 17:25:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WoJRS-0003MS-IN for qemu-devel@nongnu.org; Sat, 24 May 2014 17:25:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48256) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoJRS-0003M0-A4 for qemu-devel@nongnu.org; Sat, 24 May 2014 17:25:22 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4OLPKK4031419 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 24 May 2014 17:25:21 -0400 From: Max Reitz Date: Sat, 24 May 2014 23:24:54 +0200 Message-Id: <1400966700-23165-1-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v4 0/6] iotests: Allow out-of-tree run List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Markus Armbruster , Max Reitz , Stefan Hajnoczi This series enables qemu-iotests to be run in a build tree outside of the source tree. It also makes the tests use the command for invoking the Python interpreter specified through configure instead of always using "/usr/bin/env python". v4: - Patch 1: - fixed a comment ("assume that it truly as and always have to test" -> "assume that it truly is and have to test", regarding calls from the source tree signifying in-build trees) - {pushd,popd} -q do not what I though they do; replaced it by a redirection of their output to /dev/null - purge $here from tests/qemu-iotests/common [Fam] - Patch 2: - use symlink() instead of ln -s in configure [Fam] - Patch 3: - dropped [Fam, Eric, Markus] - Patch 4: - $build_iotests is always set as of v3, therefore it may be always used for sourcing common.env [Fam] - With patch 3 dropped, there is no need to try to source common.env.default anymore; instead, make the error message when sourcing common.env failed clearer v3: - Patch 1: - assume in-tree build when run from the source tree [Fam] - if "./qemu", "./qemu-io" etc. exist, prefer them over automatic detection - 'for binary in "*-softmmu/qemu-system-*"' is not what we want, but rather 'for binary in *-softmmu/qemu-system-*' v2: - Patch 1: - added error handling for obtaining the original source tree path name [Eric] - for this, added a new function _init_error for emitting critical errors during initialization of "check" (and employed it where applicable) - dropped superfluous doubles quotes in assignments (e.g. OUTPUT_DIR="$PWD" -> OUTPUT_DIR=$PWD) [Eric] - use [[ && ]] instead of [ -a ] [Eric] - Patch 4: - used _init_error - Patch 5: - dropped chmod +x for tests without +x [Fam] git-backport-diff against v3: Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/6:[0009] [FC] 'iotests: Allow out-of-tree run' 002/6:[0002] [FC] 'configure: Enable out-of-tree iotests' 003/6:[0014] [FC] 'iotests: Source common.env' 004/6:[----] [--] 'iotests: Use $PYTHON for Python scripts' 005/6:[----] [--] 'iotests: Drop Python version from 065's Shebang' 006/6:[----] [--] 'iotests: Fix 083 for out-of-tree builds' Max Reitz (6): iotests: Allow out-of-tree run configure: Enable out-of-tree iotests iotests: Source common.env iotests: Use $PYTHON for Python scripts iotests: Drop Python version from 065's Shebang iotests: Fix 083 for out-of-tree builds configure | 12 +++++ tests/qemu-iotests/031 | 8 +-- tests/qemu-iotests/036 | 6 +-- tests/qemu-iotests/039 | 18 +++---- tests/qemu-iotests/054 | 2 +- tests/qemu-iotests/060 | 20 +++---- tests/qemu-iotests/061 | 24 ++++----- tests/qemu-iotests/065 | 2 +- tests/qemu-iotests/083 | 10 ++-- tests/qemu-iotests/check | 110 +++++++++++++++++++++++++++++++++------ tests/qemu-iotests/common | 11 ++-- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.rc | 8 +-- tests/qemu-iotests/iotests.py | 3 +- 14 files changed, 164 insertions(+), 72 deletions(-) -- 1.9.3