From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnaZW-0003sh-ON for qemu-devel@nongnu.org; Thu, 22 May 2014 17:30:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnaZR-0006eW-7D for qemu-devel@nongnu.org; Thu, 22 May 2014 17:30:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25488) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnaZQ-0006eK-N1 for qemu-devel@nongnu.org; Thu, 22 May 2014 17:30:37 -0400 From: Max Reitz Date: Thu, 22 May 2014 23:30:24 +0200 Message-Id: <1400794231-27403-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 v3 0/7] 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 , Peter Maydell , 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". 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 v2: 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/7:[0075] [FC] 'iotests: Allow out-of-tree run' 002/7:[----] [--] 'configure: Enable out-of-tree iotests' 003/7:[----] [--] 'iotests: Add default common.env' 004/7:[----] [-C] 'iotests: Source common.env' 005/7:[----] [-C] 'iotests: Use $PYTHON for Python scripts' 006/7:[----] [--] 'iotests: Drop Python version from 065's Shebang' 007/7:[----] [--] 'iotests: Fix 083 for out-of-tree builds' Max Reitz (7): iotests: Allow out-of-tree run configure: Enable out-of-tree iotests iotests: Add default common.env 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 | 120 +++++++++++++++++++++++++++++----- tests/qemu-iotests/common | 8 +-- tests/qemu-iotests/common.config | 2 +- tests/qemu-iotests/common.env.default | 6 ++ tests/qemu-iotests/common.rc | 8 +-- tests/qemu-iotests/iotests.py | 3 +- 15 files changed, 179 insertions(+), 70 deletions(-) create mode 100644 tests/qemu-iotests/common.env.default -- 1.9.3