OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-iotests: inline common.config into common.rc

Browse Source 
common.rc has some complicated logic to find the common.config that
dates back to xfstests and is completely unnecessary now.  Just include
the contents of the file.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220505094723.732116-1-pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-05-05 11:47:23 +02:00 committed by Kevin Wolf
parent 58a6fdcc9e
commit f70625299e
2 changed files with 19 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tests/qemu-iotests/common.config
View File

@ -1,41 +0,0 @@
#!/usr/bin/env bash
#
# Copyright (C) 2009 Red Hat, Inc.
# Copyright (c) 2000-2003,2006 Silicon Graphics, Inc. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it would be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# all tests should use a common language setting to prevent golden
# output mismatches.
export LANG=C
PATH=".:$PATH"
HOSTOS=$(uname -s)
arch=$(uname -m)
[[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch"
# make sure we have a standard umask
umask 022
_optstr_add()
{
if [ -n "$1" ]; then
echo "$1,$2"
else
echo "$2"
fi
}
# make sure this script returns success
true

31
tests/qemu-iotests/common.rc
View File

@ -17,6 +17,17 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
export LANG=C
PATH=".:$PATH"
HOSTOS=$(uname -s)
arch=$(uname -m)
[[ "$arch" =~ "ppc64" ]] && qemu_arch=ppc64 || qemu_arch="$arch"
# make sure we have a standard umask
umask 022
# bail out, setting up .notrun file # bail out, setting up .notrun file
_notrun() _notrun()
{ {
@ -120,18 +131,14 @@ peek_file_raw()
dd if="$1" bs=1 skip="$2" count="$3" status=none dd if="$1" bs=1 skip="$2" count="$3" status=none
} }
config=common.config _optstr_add()
test -f $config || config=../common.config {
if ! test -f $config if [ -n "$1" ]; then
then echo "$1,$2"
echo "$0: failed to find common.config" else
exit 1 echo "$2"
fi fi
if ! . $config }
then
echo "$0: failed to source common.config"
exit 1
fi
# Set the variables to the empty string to turn Valgrind off # Set the variables to the empty string to turn Valgrind off
# for specific processes, e.g. # for specific processes, e.g.