From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex =?utf-8?Q?Benn=C3=A9e?= Subject: Re: [Qemu-devel] [kvm-unit-tests PATCH v7 03/11] run_tests: allow passing of options to QEMU Date: Mon, 28 Nov 2016 11:22:46 +0000 Message-ID: <877f7nu9vd.fsf@linaro.org> References: <20161124161033.11456-1-alex.bennee@linaro.org> <20161124161033.11456-4-alex.bennee@linaro.org> <20161128091051.zvtsvoow34b2nd5w@kamzik.brq.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 910B6405DA for ; Mon, 28 Nov 2016 06:22:04 -0500 (EST) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bgHblW0jQHE6 for ; Mon, 28 Nov 2016 06:22:03 -0500 (EST) Received: from mail-wj0-f176.google.com (mail-wj0-f176.google.com [209.85.210.176]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id E597B405B9 for ; Mon, 28 Nov 2016 06:22:02 -0500 (EST) Received: by mail-wj0-f176.google.com with SMTP id xy5so112754550wjc.0 for ; Mon, 28 Nov 2016 03:22:49 -0800 (PST) In-reply-to: <20161128091051.zvtsvoow34b2nd5w@kamzik.brq.redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: Andrew Jones Cc: mttcg@greensocs.com, nikunj@linux.vnet.ibm.com, kvm@vger.kernel.org, mark.burton@greensocs.com, marc.zyngier@arm.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, cota@braap.org, linux-arm-kernel@lists.infradead.org, pbonzini@redhat.com, serge.fdrv@gmail.com, bobby.prani@gmail.com, kvmarm@lists.cs.columbia.edu, rth@twiddle.net List-Id: kvmarm@lists.cs.columbia.edu CkFuZHJldyBKb25lcyA8ZHJqb25lc0ByZWRoYXQuY29tPiB3cml0ZXM6Cgo+IE9uIFRodSwgTm92 IDI0LCAyMDE2IGF0IDA0OjEwOjI1UE0gKzAwMDAsIEFsZXggQmVubsOpZSB3cm90ZToKPj4gVGhp cyBpbnRyb2R1Y2VzIGEgdGhlIG9wdGlvbiAtbyBmb3IgcGFzc2luZyBvZiBvcHRpb25zIGRpcmVj dGx5IHRvIFFFTVUKPj4gd2hpY2ggaXMgdXNlZnVsLiBJbiBteSBjYXNlIEknbSB1c2luZyBpdCB0 byB0b2dnbGUgTVRUQ0cgb24gYW4gb2ZmOgo+Pgo+PiAgIC4vcnVuX3Rlc3RzLnNoIC10IC1vICIt dGNnIG10dGNnPW9uIgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBBbGV4IEJlbm7DqWUgPGFsZXguYmVu bmVlQGxpbmFyby5vcmc+Cj4+IC0tLQo+PiAgcnVuX3Rlc3RzLnNoICAgICAgICAgICB8IDEwICsr KysrKystLS0KPj4gIHNjcmlwdHMvZnVuY3Rpb25zLmJhc2ggfCAxMyArKysrKysrLS0tLS0tCj4+ ICAyIGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCj4+Cj4+ IGRpZmYgLS1naXQgYS9ydW5fdGVzdHMuc2ggYi9ydW5fdGVzdHMuc2gKPj4gaW5kZXggNGYyZTVj Yi4uMDVjYzdmYiAxMDA3NTUKPj4gLS0tIGEvcnVuX3Rlc3RzLnNoCj4+ICsrKyBiL3J1bl90ZXN0 cy5zaAo+PiBAQCAtMTMsMTAgKzEzLDExIEBAIGZ1bmN0aW9uIHVzYWdlKCkKPj4gIHsKPj4gIGNh dCA8PEVPRgo+Pgo+PiAtVXNhZ2U6ICQwIFstZyBncm91cF0gWy1hIGFjY2VsXSBbLXRdIFstaF0g Wy12XQo+PiArVXNhZ2U6ICQwIFstZyBncm91cF0gWy1hIGFjY2VsXSBbLW8gcWVtdV9vcHRzXSBb LXRdIFstaF0gWy12XQo+Pgo+PiAgICAgIC1nOiBPbmx5IGV4ZWN1dGUgdGVzdHMgaW4gdGhlIGdp dmVuIGdyb3VwCj4+ICAgICAgLWE6IEZvcmNlIGFjY2VsZXJhdGlvbiBtb2RlICh0Y2cva3ZtKQo+ PiArICAgIC1vOiBhZGRpdGlvbmFsIG9wdGlvbnMgZm9yIFFFTVUgY29tbWFuZCBsaW5lCj4+ICAg ICAgLXQ6IGRpc2FibGUgdGltZW91dHMKPj4gICAgICAtaDogT3V0cHV0IHRoaXMgaGVscCB0ZXh0 Cj4+ICAgICAgLXY6IEVuYWJsZXMgdmVyYm9zZSBtb2RlCj4+IEBAIC0zMCw3ICszMSw3IEBAIEVP Rgo+PiAgUlVOVElNRV9hcmNoX3J1bj0iLi8kVEVTVF9ESVIvcnVuIgo+PiAgc291cmNlIHNjcmlw dHMvcnVudGltZS5iYXNoCj4+Cj4+IC13aGlsZSBnZXRvcHRzICJnOmE6dGh2IiBvcHQ7IGRvCj4+ ICt3aGlsZSBnZXRvcHRzICJnOmE6bzp0aHYiIG9wdDsgZG8KPj4gICAgICBjYXNlICRvcHQgaW4K Pj4gICAgICAgICAgZykKPj4gICAgICAgICAgICAgIG9ubHlfZ3JvdXA9JE9QVEFSRwo+PiBAQCAt MzgsNiArMzksOSBAQCB3aGlsZSBnZXRvcHRzICJnOmE6dGh2IiBvcHQ7IGRvCj4+ICAgICAgICAg IGEpCj4+ICAgICAgICAgICAgICBmb3JjZV9hY2NlbD0kT1BUQVJHCj4+ICAgICAgICAgICAgICA7 Owo+PiArICAgICAgICBvKQo+PiArICAgICAgICAgICAgZXh0cmFfb3B0cz0kT1BUQVJHCj4+ICsg ICAgICAgICAgICA7Owo+PiAgICAgICAgICB0KQo+PiAgICAgICAgICAgICAgbm9fdGltZW91dD0i eWVzIgo+PiAgICAgICAgICAgICAgOzsKPj4gQEAgLTY3LDQgKzcxLDQgQEAgUlVOVElNRV9sb2df c3Rkb3V0ICgpIHsKPj4gIGNvbmZpZz0kVEVTVF9ESVIvdW5pdHRlc3RzLmNmZwo+PiAgcm0gLWYg dGVzdC5sb2cKPj4gIHByaW50ZiAiQlVJTERfSEVBRD0kKGNhdCBidWlsZC1oZWFkKVxuXG4iID4g dGVzdC5sb2cKPj4gLWZvcl9lYWNoX3VuaXR0ZXN0ICRjb25maWcgcnVuCj4+ICtmb3JfZWFjaF91 bml0dGVzdCAkY29uZmlnIHJ1biAiJGV4dHJhX29wdHMiCj4+IGRpZmYgLS1naXQgYS9zY3JpcHRz L2Z1bmN0aW9ucy5iYXNoIGIvc2NyaXB0cy9mdW5jdGlvbnMuYmFzaAo+PiBpbmRleCBlZTkxNDNj Li5kMzhhNjllIDEwMDY0NAo+PiAtLS0gYS9zY3JpcHRzL2Z1bmN0aW9ucy5iYXNoCj4+ICsrKyBi L3NjcmlwdHMvZnVuY3Rpb25zLmJhc2gKPj4gQEAgLTIsMTEgKzIsMTIgQEAKPj4gIGZ1bmN0aW9u IGZvcl9lYWNoX3VuaXR0ZXN0KCkKPj4gIHsKPj4gIAlsb2NhbCB1bml0dGVzdHM9IiQxIgo+PiAt CWxvY2FsIGNtZD0iJDIiCj4+IC0JbG9jYWwgdGVzdG5hbWUKPj4gKyAgICAgICAgbG9jYWwgY21k PSIkMiIKPj4gKyAgICAgICAgbG9jYWwgZXh0cmFfb3B0cz0kMwo+PiArICAgICAgICBsb2NhbCB0 ZXN0bmFtZQo+Cj4gV2UgdXNlIHRhYnMgaW4gdGhpcyBmaWxlLiBOb3Qgc3VyZSB3aHkgY21kIGFu ZCB0ZXN0bmFtZSBnb3QKPiBjaGFuZ2VkIHRvby4uLgo+Cj4+ICAJbG9jYWwgc21wCj4+ICAJbG9j YWwga2VybmVsCj4+IC0JbG9jYWwgb3B0cwo+PiArICAgICAgICBsb2NhbCBvcHRzPSRleHRyYV9v cHRzCj4+ICAJbG9jYWwgZ3JvdXBzCj4+ICAJbG9jYWwgYXJjaAo+PiAgCWxvY2FsIGNoZWNrCj4+ IEBAIC0yMSw3ICsyMiw3IEBAIGZ1bmN0aW9uIGZvcl9lYWNoX3VuaXR0ZXN0KCkKPj4gIAkJCXRl c3RuYW1lPSR7QkFTSF9SRU1BVENIWzFdfQo+PiAgCQkJc21wPTEKPj4gIAkJCWtlcm5lbD0iIgo+ PiAtCQkJb3B0cz0iIgo+PiArICAgICAgICAgICAgICAgICAgICAgICAgb3B0cz0kZXh0cmFfb3B0 cwo+PiAgCQkJZ3JvdXBzPSIiCj4+ICAJCQlhcmNoPSIiCj4+ICAJCQljaGVjaz0iIgo+PiBAQCAt MzIsNyArMzMsNyBAQCBmdW5jdGlvbiBmb3JfZWFjaF91bml0dGVzdCgpCj4+ICAJCWVsaWYgW1sg JGxpbmUgPX4gXnNtcFwgKj1cICooLiopJCBdXTsgdGhlbgo+PiAgCQkJc21wPSR7QkFTSF9SRU1B VENIWzFdfQo+PiAgCQllbGlmIFtbICRsaW5lID1+IF5leHRyYV9wYXJhbXNcICo9XCAqKC4qKSQg XV07IHRoZW4KPj4gLQkJCW9wdHM9JHtCQVNIX1JFTUFUQ0hbMV19Cj4+ICsgICAgICAgICAgICAg ICAgICAgICAgICBvcHRzPSIkb3B0cyAke0JBU0hfUkVNQVRDSFsxXX0iCj4+ICAJCWVsaWYgW1sg JGxpbmUgPX4gXmdyb3Vwc1wgKj1cICooLiopJCBdXTsgdGhlbgo+PiAgCQkJZ3JvdXBzPSR7QkFT SF9SRU1BVENIWzFdfQo+PiAgCQllbGlmIFtbICRsaW5lID1+IF5hcmNoXCAqPVwgKiguKikkIF1d OyB0aGVuCj4+IEBAIC00NSw2ICs0Niw2IEBAIGZ1bmN0aW9uIGZvcl9lYWNoX3VuaXR0ZXN0KCkK Pj4gIAkJCXRpbWVvdXQ9JHtCQVNIX1JFTUFUQ0hbMV19Cj4+ICAJCWZpCj4+ICAJZG9uZQo+PiAt CSIkY21kIiAiJHRlc3RuYW1lIiAiJGdyb3VwcyIgIiRzbXAiICIka2VybmVsIiAiJG9wdHMiICIk YXJjaCIgIiRjaGVjayIgIiRhY2NlbCIgIiR0aW1lb3V0Igo+PiArICAgICAgICAiJGNtZCIgIiR0 ZXN0bmFtZSIgIiRncm91cHMiICIkc21wIiAiJGtlcm5lbCIgIiRvcHRzIiAiJGFyY2giICIkY2hl Y2siICIkYWNjZWwiICIkdGltZW91dCIKPj4gIAlleGVjIHtmZH08Ji0KPj4gIH0KPj4gLS0KPj4g Mi4xMC4xCj4+Cj4+Cj4KPiBUaGlzIGlzIGEgcHJldHR5IGdvb2QgaWRlYSwgYnV0IEkgdGhpbmsg SSBtaWdodCBsaWtlIHRoZSBleHRyYSBvcHRpb25zCj4gdG8gYmUgZ2l2ZW4gbGlrZSB0aGlzIGlu c3RlYWQKPgo+ICAgLi9ydW5fdGVzdHMuc2ggW3J1bl90ZXN0cy5zaCBvcHRpb25zXSAtLSBbcWVt dSBvcHRpb25zXQo+Cj4gVGhhbmtzLAo+IGRyZXcKClRoYXQgc291bmRzIGxpa2UgYSBiZXR0ZXIg d2F5LCBJJ2xsIGZpeCB0aGF0LgoKLS0KQWxleCBCZW5uw6llCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmt2bWFybSBtYWlsaW5nIGxpc3QKa3ZtYXJtQGxp c3RzLmNzLmNvbHVtYmlhLmVkdQpodHRwczovL2xpc3RzLmNzLmNvbHVtYmlhLmVkdS9tYWlsbWFu L2xpc3RpbmZvL2t2bWFybQo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: alex.bennee@linaro.org (Alex =?utf-8?Q?Benn=C3=A9e?=) Date: Mon, 28 Nov 2016 11:22:46 +0000 Subject: [Qemu-devel] [kvm-unit-tests PATCH v7 03/11] run_tests: allow passing of options to QEMU In-Reply-To: <20161128091051.zvtsvoow34b2nd5w@kamzik.brq.redhat.com> References: <20161124161033.11456-1-alex.bennee@linaro.org> <20161124161033.11456-4-alex.bennee@linaro.org> <20161128091051.zvtsvoow34b2nd5w@kamzik.brq.redhat.com> Message-ID: <877f7nu9vd.fsf@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Andrew Jones writes: > On Thu, Nov 24, 2016 at 04:10:25PM +0000, Alex Benn?e wrote: >> This introduces a the option -o for passing of options directly to QEMU >> which is useful. In my case I'm using it to toggle MTTCG on an off: >> >> ./run_tests.sh -t -o "-tcg mttcg=on" >> >> Signed-off-by: Alex Benn?e >> --- >> run_tests.sh | 10 +++++++--- >> scripts/functions.bash | 13 +++++++------ >> 2 files changed, 14 insertions(+), 9 deletions(-) >> >> diff --git a/run_tests.sh b/run_tests.sh >> index 4f2e5cb..05cc7fb 100755 >> --- a/run_tests.sh >> +++ b/run_tests.sh >> @@ -13,10 +13,11 @@ function usage() >> { >> cat <> >> -Usage: $0 [-g group] [-a accel] [-t] [-h] [-v] >> +Usage: $0 [-g group] [-a accel] [-o qemu_opts] [-t] [-h] [-v] >> >> -g: Only execute tests in the given group >> -a: Force acceleration mode (tcg/kvm) >> + -o: additional options for QEMU command line >> -t: disable timeouts >> -h: Output this help text >> -v: Enables verbose mode >> @@ -30,7 +31,7 @@ EOF >> RUNTIME_arch_run="./$TEST_DIR/run" >> source scripts/runtime.bash >> >> -while getopts "g:a:thv" opt; do >> +while getopts "g:a:o:thv" opt; do >> case $opt in >> g) >> only_group=$OPTARG >> @@ -38,6 +39,9 @@ while getopts "g:a:thv" opt; do >> a) >> force_accel=$OPTARG >> ;; >> + o) >> + extra_opts=$OPTARG >> + ;; >> t) >> no_timeout="yes" >> ;; >> @@ -67,4 +71,4 @@ RUNTIME_log_stdout () { >> config=$TEST_DIR/unittests.cfg >> rm -f test.log >> printf "BUILD_HEAD=$(cat build-head)\n\n" > test.log >> -for_each_unittest $config run >> +for_each_unittest $config run "$extra_opts" >> diff --git a/scripts/functions.bash b/scripts/functions.bash >> index ee9143c..d38a69e 100644 >> --- a/scripts/functions.bash >> +++ b/scripts/functions.bash >> @@ -2,11 +2,12 @@ >> function for_each_unittest() >> { >> local unittests="$1" >> - local cmd="$2" >> - local testname >> + local cmd="$2" >> + local extra_opts=$3 >> + local testname > > We use tabs in this file. Not sure why cmd and testname got > changed too... > >> local smp >> local kernel >> - local opts >> + local opts=$extra_opts >> local groups >> local arch >> local check >> @@ -21,7 +22,7 @@ function for_each_unittest() >> testname=${BASH_REMATCH[1]} >> smp=1 >> kernel="" >> - opts="" >> + opts=$extra_opts >> groups="" >> arch="" >> check="" >> @@ -32,7 +33,7 @@ function for_each_unittest() >> elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then >> smp=${BASH_REMATCH[1]} >> elif [[ $line =~ ^extra_params\ *=\ *(.*)$ ]]; then >> - opts=${BASH_REMATCH[1]} >> + opts="$opts ${BASH_REMATCH[1]}" >> elif [[ $line =~ ^groups\ *=\ *(.*)$ ]]; then >> groups=${BASH_REMATCH[1]} >> elif [[ $line =~ ^arch\ *=\ *(.*)$ ]]; then >> @@ -45,6 +46,6 @@ function for_each_unittest() >> timeout=${BASH_REMATCH[1]} >> fi >> done >> - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" >> + "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" >> exec {fd}<&- >> } >> -- >> 2.10.1 >> >> > > This is a pretty good idea, but I think I might like the extra options > to be given like this instead > > ./run_tests.sh [run_tests.sh options] -- [qemu options] > > Thanks, > drew That sounds like a better way, I'll fix that. -- Alex Benn?e From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBK2O-0003oH-5u for qemu-devel@nongnu.org; Mon, 28 Nov 2016 06:23:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cBK2J-0002i1-6m for qemu-devel@nongnu.org; Mon, 28 Nov 2016 06:23:56 -0500 Received: from mail-wj0-f171.google.com ([209.85.210.171]:33173) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cBK2I-0002hh-V7 for qemu-devel@nongnu.org; Mon, 28 Nov 2016 06:23:51 -0500 Received: by mail-wj0-f171.google.com with SMTP id xy5so112754889wjc.0 for ; Mon, 28 Nov 2016 03:23:50 -0800 (PST) References: <20161124161033.11456-1-alex.bennee@linaro.org> <20161124161033.11456-4-alex.bennee@linaro.org> <20161128091051.zvtsvoow34b2nd5w@kamzik.brq.redhat.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <20161128091051.zvtsvoow34b2nd5w@kamzik.brq.redhat.com> Date: Mon, 28 Nov 2016 11:22:46 +0000 Message-ID: <877f7nu9vd.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [kvm-unit-tests PATCH v7 03/11] run_tests: allow passing of options to QEMU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andrew Jones Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, mttcg@greensocs.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, nikunj@linux.vnet.ibm.com, jan.kiszka@siemens.com, mark.burton@greensocs.com, a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, serge.fdrv@gmail.com, pbonzini@redhat.com, bobby.prani@gmail.com, rth@twiddle.net, fred.konrad@greensocs.com Andrew Jones writes: > On Thu, Nov 24, 2016 at 04:10:25PM +0000, Alex Bennée wrote: >> This introduces a the option -o for passing of options directly to QEMU >> which is useful. In my case I'm using it to toggle MTTCG on an off: >> >> ./run_tests.sh -t -o "-tcg mttcg=on" >> >> Signed-off-by: Alex Bennée >> --- >> run_tests.sh | 10 +++++++--- >> scripts/functions.bash | 13 +++++++------ >> 2 files changed, 14 insertions(+), 9 deletions(-) >> >> diff --git a/run_tests.sh b/run_tests.sh >> index 4f2e5cb..05cc7fb 100755 >> --- a/run_tests.sh >> +++ b/run_tests.sh >> @@ -13,10 +13,11 @@ function usage() >> { >> cat <> >> -Usage: $0 [-g group] [-a accel] [-t] [-h] [-v] >> +Usage: $0 [-g group] [-a accel] [-o qemu_opts] [-t] [-h] [-v] >> >> -g: Only execute tests in the given group >> -a: Force acceleration mode (tcg/kvm) >> + -o: additional options for QEMU command line >> -t: disable timeouts >> -h: Output this help text >> -v: Enables verbose mode >> @@ -30,7 +31,7 @@ EOF >> RUNTIME_arch_run="./$TEST_DIR/run" >> source scripts/runtime.bash >> >> -while getopts "g:a:thv" opt; do >> +while getopts "g:a:o:thv" opt; do >> case $opt in >> g) >> only_group=$OPTARG >> @@ -38,6 +39,9 @@ while getopts "g:a:thv" opt; do >> a) >> force_accel=$OPTARG >> ;; >> + o) >> + extra_opts=$OPTARG >> + ;; >> t) >> no_timeout="yes" >> ;; >> @@ -67,4 +71,4 @@ RUNTIME_log_stdout () { >> config=$TEST_DIR/unittests.cfg >> rm -f test.log >> printf "BUILD_HEAD=$(cat build-head)\n\n" > test.log >> -for_each_unittest $config run >> +for_each_unittest $config run "$extra_opts" >> diff --git a/scripts/functions.bash b/scripts/functions.bash >> index ee9143c..d38a69e 100644 >> --- a/scripts/functions.bash >> +++ b/scripts/functions.bash >> @@ -2,11 +2,12 @@ >> function for_each_unittest() >> { >> local unittests="$1" >> - local cmd="$2" >> - local testname >> + local cmd="$2" >> + local extra_opts=$3 >> + local testname > > We use tabs in this file. Not sure why cmd and testname got > changed too... > >> local smp >> local kernel >> - local opts >> + local opts=$extra_opts >> local groups >> local arch >> local check >> @@ -21,7 +22,7 @@ function for_each_unittest() >> testname=${BASH_REMATCH[1]} >> smp=1 >> kernel="" >> - opts="" >> + opts=$extra_opts >> groups="" >> arch="" >> check="" >> @@ -32,7 +33,7 @@ function for_each_unittest() >> elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then >> smp=${BASH_REMATCH[1]} >> elif [[ $line =~ ^extra_params\ *=\ *(.*)$ ]]; then >> - opts=${BASH_REMATCH[1]} >> + opts="$opts ${BASH_REMATCH[1]}" >> elif [[ $line =~ ^groups\ *=\ *(.*)$ ]]; then >> groups=${BASH_REMATCH[1]} >> elif [[ $line =~ ^arch\ *=\ *(.*)$ ]]; then >> @@ -45,6 +46,6 @@ function for_each_unittest() >> timeout=${BASH_REMATCH[1]} >> fi >> done >> - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" >> + "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" >> exec {fd}<&- >> } >> -- >> 2.10.1 >> >> > > This is a pretty good idea, but I think I might like the extra options > to be given like this instead > > ./run_tests.sh [run_tests.sh options] -- [qemu options] > > Thanks, > drew That sounds like a better way, I'll fix that. -- Alex Bennée