| Message ID | 20250120164316.31473-5-alexandru.elisei@arm.com |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | arm/arm64: Add kvmtool to the runner script | expand |
On Mon, Jan 20, 2025 at 04:43:02PM +0000, Alexandru Elisei wrote: > Tests for the arm and arm64 architectures can also be run with kvmtool, and > work is under way to have it supported by the run_tests.sh test runner. Not > suprisingly, kvmtool has a different syntax than qemu when configuring and > running a virtual machine. > > Add a new unittest parameter, 'qemu_params', with the goal to add a similar > parameter for each virtual machine manager that run_tests.sh supports. > > 'qemu_params' and 'extra_params' are interchangeable, but it is expected > that going forward new tests will use 'qemu_params'. A test should have > only one of the two parameters. > > While we're at it, rename the variable opts to qemu_opts to match the new > unit configuration name, and to make it easier to distinguish from the > kvmtool parameters when they'll be added. > > Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> > --- > docs/unittests.txt | 17 +++++++++----- > scripts/common.bash | 53 ++++++++++++++++++++++++++------------------ > scripts/runtime.bash | 10 ++++----- > 3 files changed, 47 insertions(+), 33 deletions(-) > > diff --git a/docs/unittests.txt b/docs/unittests.txt > index dbc2c11e3b59..3e1a9e563016 100644 > --- a/docs/unittests.txt > +++ b/docs/unittests.txt > @@ -24,9 +24,9 @@ param = value format. > > Available parameters > ==================== > -Note! Some parameters like smp and extra_params modify how a test is run, > -while others like arch and accel restrict the configurations in which the > -test is run. > +Note! Some parameters like smp and qemu_params/extra_params modify how a > +test is run, while others like arch and accel restrict the configurations > +in which the test is run. > > file > ---- > @@ -56,13 +56,18 @@ smp = <number> > Optional, the number of processors created in the machine to run the test. > Defaults to 1. $MAX_SMP can be used to specify the maximum supported. > > -extra_params > ------------- > +qemu_params > +----------- > These are extra parameters supplied to the QEMU process. -append '...' can > be used to pass arguments into the test case argv. Multiple parameters can > be added, for example: > > -extra_params = -m 256 -append 'smp=2' > +qemu_params = -m 256 -append 'smp=2' > + > +extra_params > +------------ > +Alias for 'qemu_params', supported for compatibility purposes. Use > +'qemu_params' for new tests. > > groups > ------ > diff --git a/scripts/common.bash b/scripts/common.bash > index 3aa557c8c03d..a40c28121b6a 100644 > --- a/scripts/common.bash > +++ b/scripts/common.bash > @@ -1,5 +1,28 @@ > source config.mak > > +function parse_opts() > +{ > + local opts="$1" > + local fd="$2" > + > + while read -r -u $fd; do > + #escape backslash newline, but not double backslash > + if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then > + if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then > + opts=${opts%\\$'\n'} > + fi > + fi > + if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then > + opts+=${BASH_REMATCH[1]} > + break > + else > + opts+=$REPLY$'\n' > + fi > + done > + > + echo "$opts" > +} > + > function for_each_unittest() > { > local unittests="$1" > @@ -7,7 +30,7 @@ function for_each_unittest() > local testname > local smp > local kernel > - local opts > + local qemu_opts > local groups > local arch > local machine > @@ -22,12 +45,12 @@ function for_each_unittest() > if [[ "$line" =~ ^\[(.*)\]$ ]]; then > rematch=${BASH_REMATCH[1]} > if [ -n "${testname}" ]; then > - $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" > + $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$qemu_opts" "$arch" "$machine" "$check" "$accel" "$timeout" > fi > testname=$rematch > smp=1 > kernel="" > - opts="" > + qemu_opts="" > groups="" > arch="" > machine="" > @@ -38,24 +61,10 @@ function for_each_unittest() > kernel=$TEST_DIR/${BASH_REMATCH[1]} > elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then > smp=${BASH_REMATCH[1]} > - elif [[ $line =~ ^extra_params\ *=\ *'"""'(.*)$ ]]; then > - opts=${BASH_REMATCH[1]}$'\n' > - while read -r -u $fd; do > - #escape backslash newline, but not double backslash > - if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then > - if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then > - opts=${opts%\\$'\n'} > - fi > - fi > - if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then > - opts+=${BASH_REMATCH[1]} > - break > - else > - opts+=$REPLY$'\n' > - fi > - done > - elif [[ $line =~ ^extra_params\ *=\ *(.*)$ ]]; then > - opts=${BASH_REMATCH[1]} > + elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *'"""'(.*)$ ]]; then > + qemu_opts=$(parse_opts ${BASH_REMATCH[2]}$'\n' $fd) > + elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *(.*)$ ]]; then > + qemu_opts=${BASH_REMATCH[2]} > elif [[ $line =~ ^groups\ *=\ *(.*)$ ]]; then > groups=${BASH_REMATCH[1]} > elif [[ $line =~ ^arch\ *=\ *(.*)$ ]]; then > @@ -71,7 +80,7 @@ function for_each_unittest() > fi > done > if [ -n "${testname}" ]; then > - $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" > + $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$qemu_opts" "$arch" "$machine" "$check" "$accel" "$timeout" > fi > exec {fd}<&- > } > diff --git a/scripts/runtime.bash b/scripts/runtime.bash > index 4b9c7d6b7c39..e5d661684ceb 100644 > --- a/scripts/runtime.bash > +++ b/scripts/runtime.bash > @@ -34,7 +34,7 @@ premature_failure() > get_cmdline() > { > local kernel=$1 > - echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $opts" > + echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $qemu_opts" > } > > skip_nodefault() > @@ -80,7 +80,7 @@ function run() > local groups="$2" > local smp="$3" > local kernel="$4" > - local opts="$5" > + local qemu_opts="$5" > local arch="$6" > local machine="$7" > local check="${CHECK:-$8}" > @@ -179,9 +179,9 @@ function run() > echo $cmdline > fi > > - # extra_params in the config file may contain backticks that need to be > - # expanded, so use eval to start qemu. Use "> >(foo)" instead of a pipe to > - # preserve the exit status. > + # qemu_params/extra_params in the config file may contain backticks that > + # need to be expanded, so use eval to start qemu. Use "> >(foo)" instead of > + # a pipe to preserve the exit status. > summary=$(eval "$cmdline" 2> >(RUNTIME_log_stderr $testname) \ > > >(tee >(RUNTIME_log_stdout $testname $kernel) | extract_summary)) > ret=$? > -- > 2.47.1 > Hmm, I'll keep reading the series, but it seems like we should be choosing generic names like 'extra_params' and 'opts' that we plan to use for both QEMU and kvmtool since they both have the concepts of "options" and "extra params". Thanks, drew
Hi Drew, On Tue, Jan 21, 2025 at 04:46:24PM +0100, Andrew Jones wrote: > On Mon, Jan 20, 2025 at 04:43:02PM +0000, Alexandru Elisei wrote: > > Tests for the arm and arm64 architectures can also be run with kvmtool, and > > work is under way to have it supported by the run_tests.sh test runner. Not > > suprisingly, kvmtool has a different syntax than qemu when configuring and > > running a virtual machine. > > > > Add a new unittest parameter, 'qemu_params', with the goal to add a similar > > parameter for each virtual machine manager that run_tests.sh supports. > > > > 'qemu_params' and 'extra_params' are interchangeable, but it is expected > > that going forward new tests will use 'qemu_params'. A test should have > > only one of the two parameters. > > > > While we're at it, rename the variable opts to qemu_opts to match the new > > unit configuration name, and to make it easier to distinguish from the > > kvmtool parameters when they'll be added. > > > > Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> > > --- > > docs/unittests.txt | 17 +++++++++----- > > scripts/common.bash | 53 ++++++++++++++++++++++++++------------------ > > scripts/runtime.bash | 10 ++++----- > > 3 files changed, 47 insertions(+), 33 deletions(-) > > > > diff --git a/docs/unittests.txt b/docs/unittests.txt > > index dbc2c11e3b59..3e1a9e563016 100644 > > --- a/docs/unittests.txt > > +++ b/docs/unittests.txt > > @@ -24,9 +24,9 @@ param = value format. > > > > Available parameters > > ==================== > > -Note! Some parameters like smp and extra_params modify how a test is run, > > -while others like arch and accel restrict the configurations in which the > > -test is run. > > +Note! Some parameters like smp and qemu_params/extra_params modify how a > > +test is run, while others like arch and accel restrict the configurations > > +in which the test is run. > > > > file > > ---- > > @@ -56,13 +56,18 @@ smp = <number> > > Optional, the number of processors created in the machine to run the test. > > Defaults to 1. $MAX_SMP can be used to specify the maximum supported. > > > > -extra_params > > ------------- > > +qemu_params > > +----------- > > These are extra parameters supplied to the QEMU process. -append '...' can > > be used to pass arguments into the test case argv. Multiple parameters can > > be added, for example: > > > > -extra_params = -m 256 -append 'smp=2' > > +qemu_params = -m 256 -append 'smp=2' > > + > > +extra_params > > +------------ > > +Alias for 'qemu_params', supported for compatibility purposes. Use > > +'qemu_params' for new tests. > > > > groups > > ------ > > diff --git a/scripts/common.bash b/scripts/common.bash > > index 3aa557c8c03d..a40c28121b6a 100644 > > --- a/scripts/common.bash > > +++ b/scripts/common.bash > > @@ -1,5 +1,28 @@ > > source config.mak > > > > +function parse_opts() > > +{ > > + local opts="$1" > > + local fd="$2" > > + > > + while read -r -u $fd; do > > + #escape backslash newline, but not double backslash > > + if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then > > + if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then > > + opts=${opts%\\$'\n'} > > + fi > > + fi > > + if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then > > + opts+=${BASH_REMATCH[1]} > > + break > > + else > > + opts+=$REPLY$'\n' > > + fi > > + done > > + > > + echo "$opts" > > +} > > + > > function for_each_unittest() > > { > > local unittests="$1" > > @@ -7,7 +30,7 @@ function for_each_unittest() > > local testname > > local smp > > local kernel > > - local opts > > + local qemu_opts > > local groups > > local arch > > local machine > > @@ -22,12 +45,12 @@ function for_each_unittest() > > if [[ "$line" =~ ^\[(.*)\]$ ]]; then > > rematch=${BASH_REMATCH[1]} > > if [ -n "${testname}" ]; then > > - $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" > > + $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$qemu_opts" "$arch" "$machine" "$check" "$accel" "$timeout" > > fi > > testname=$rematch > > smp=1 > > kernel="" > > - opts="" > > + qemu_opts="" > > groups="" > > arch="" > > machine="" > > @@ -38,24 +61,10 @@ function for_each_unittest() > > kernel=$TEST_DIR/${BASH_REMATCH[1]} > > elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then > > smp=${BASH_REMATCH[1]} > > - elif [[ $line =~ ^extra_params\ *=\ *'"""'(.*)$ ]]; then > > - opts=${BASH_REMATCH[1]}$'\n' > > - while read -r -u $fd; do > > - #escape backslash newline, but not double backslash > > - if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then > > - if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then > > - opts=${opts%\\$'\n'} > > - fi > > - fi > > - if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then > > - opts+=${BASH_REMATCH[1]} > > - break > > - else > > - opts+=$REPLY$'\n' > > - fi > > - done > > - elif [[ $line =~ ^extra_params\ *=\ *(.*)$ ]]; then > > - opts=${BASH_REMATCH[1]} > > + elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *'"""'(.*)$ ]]; then > > + qemu_opts=$(parse_opts ${BASH_REMATCH[2]}$'\n' $fd) > > + elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *(.*)$ ]]; then > > + qemu_opts=${BASH_REMATCH[2]} > > elif [[ $line =~ ^groups\ *=\ *(.*)$ ]]; then > > groups=${BASH_REMATCH[1]} > > elif [[ $line =~ ^arch\ *=\ *(.*)$ ]]; then > > @@ -71,7 +80,7 @@ function for_each_unittest() > > fi > > done > > if [ -n "${testname}" ]; then > > - $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" > > + $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$qemu_opts" "$arch" "$machine" "$check" "$accel" "$timeout" > > fi > > exec {fd}<&- > > } > > diff --git a/scripts/runtime.bash b/scripts/runtime.bash > > index 4b9c7d6b7c39..e5d661684ceb 100644 > > --- a/scripts/runtime.bash > > +++ b/scripts/runtime.bash > > @@ -34,7 +34,7 @@ premature_failure() > > get_cmdline() > > { > > local kernel=$1 > > - echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $opts" > > + echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $qemu_opts" > > } > > > > skip_nodefault() > > @@ -80,7 +80,7 @@ function run() > > local groups="$2" > > local smp="$3" > > local kernel="$4" > > - local opts="$5" > > + local qemu_opts="$5" > > local arch="$6" > > local machine="$7" > > local check="${CHECK:-$8}" > > @@ -179,9 +179,9 @@ function run() > > echo $cmdline > > fi > > > > - # extra_params in the config file may contain backticks that need to be > > - # expanded, so use eval to start qemu. Use "> >(foo)" instead of a pipe to > > - # preserve the exit status. > > + # qemu_params/extra_params in the config file may contain backticks that > > + # need to be expanded, so use eval to start qemu. Use "> >(foo)" instead of > > + # a pipe to preserve the exit status. > > summary=$(eval "$cmdline" 2> >(RUNTIME_log_stderr $testname) \ > > > >(tee >(RUNTIME_log_stdout $testname $kernel) | extract_summary)) > > ret=$? > > -- > > 2.47.1 > > > > Hmm, I'll keep reading the series, but it seems like we should be choosing > generic names like 'extra_params' and 'opts' that we plan to use for both > QEMU and kvmtool since they both have the concepts of "options" and "extra > params". I'm afraid I don't follow you. 'qemu_params' was chosen because it uses qemu-specific syntax. Same for 'kvmtool_params', introduced later in the series. Are you referring to unittests.cfg or to something else? Thanks, Alex
On Wed, Feb 12, 2025 at 01:40:51PM +0000, Alexandru Elisei wrote: ... > > > @@ -80,7 +80,7 @@ function run() > > > local groups="$2" > > > local smp="$3" > > > local kernel="$4" > > > - local opts="$5" > > > + local qemu_opts="$5" > > > local arch="$6" > > > local machine="$7" > > > local check="${CHECK:-$8}" > > > @@ -179,9 +179,9 @@ function run() > > > echo $cmdline > > > fi > > > > > > - # extra_params in the config file may contain backticks that need to be > > > - # expanded, so use eval to start qemu. Use "> >(foo)" instead of a pipe to > > > - # preserve the exit status. > > > + # qemu_params/extra_params in the config file may contain backticks that > > > + # need to be expanded, so use eval to start qemu. Use "> >(foo)" instead of > > > + # a pipe to preserve the exit status. > > > summary=$(eval "$cmdline" 2> >(RUNTIME_log_stderr $testname) \ > > > > >(tee >(RUNTIME_log_stdout $testname $kernel) | extract_summary)) > > > ret=$? > > > -- > > > 2.47.1 > > > > > > > Hmm, I'll keep reading the series, but it seems like we should be choosing > > generic names like 'extra_params' and 'opts' that we plan to use for both > > QEMU and kvmtool since they both have the concepts of "options" and "extra > > params". > > I'm afraid I don't follow you. 'qemu_params' was chosen because it uses > qemu-specific syntax. Same for 'kvmtool_params', introduced later in the > series. Are you referring to unittests.cfg or to something else? > I didn't like the renaming of opts to qemu_opts since both kvmtool and qemu have "options", so it seems like we should be generalizing variable names rather than making them more specific. I see later how there may be a need for qemu_options, kvmtool_options, and unit test cmdline_options in the unittests.cfg, though. However, here, it seems like we could still use 'opts' for the variable and just use another variable to determine if we parse qemu_options or kvmtool_options, since there shouldn't be a need to parse both. Thanks, drew
diff --git a/docs/unittests.txt b/docs/unittests.txt index dbc2c11e3b59..3e1a9e563016 100644 --- a/docs/unittests.txt +++ b/docs/unittests.txt @@ -24,9 +24,9 @@ param = value format. Available parameters ==================== -Note! Some parameters like smp and extra_params modify how a test is run, -while others like arch and accel restrict the configurations in which the -test is run. +Note! Some parameters like smp and qemu_params/extra_params modify how a +test is run, while others like arch and accel restrict the configurations +in which the test is run. file ---- @@ -56,13 +56,18 @@ smp = <number> Optional, the number of processors created in the machine to run the test. Defaults to 1. $MAX_SMP can be used to specify the maximum supported. -extra_params ------------- +qemu_params +----------- These are extra parameters supplied to the QEMU process. -append '...' can be used to pass arguments into the test case argv. Multiple parameters can be added, for example: -extra_params = -m 256 -append 'smp=2' +qemu_params = -m 256 -append 'smp=2' + +extra_params +------------ +Alias for 'qemu_params', supported for compatibility purposes. Use +'qemu_params' for new tests. groups ------ diff --git a/scripts/common.bash b/scripts/common.bash index 3aa557c8c03d..a40c28121b6a 100644 --- a/scripts/common.bash +++ b/scripts/common.bash @@ -1,5 +1,28 @@ source config.mak +function parse_opts() +{ + local opts="$1" + local fd="$2" + + while read -r -u $fd; do + #escape backslash newline, but not double backslash + if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then + if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then + opts=${opts%\\$'\n'} + fi + fi + if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then + opts+=${BASH_REMATCH[1]} + break + else + opts+=$REPLY$'\n' + fi + done + + echo "$opts" +} + function for_each_unittest() { local unittests="$1" @@ -7,7 +30,7 @@ function for_each_unittest() local testname local smp local kernel - local opts + local qemu_opts local groups local arch local machine @@ -22,12 +45,12 @@ function for_each_unittest() if [[ "$line" =~ ^\[(.*)\]$ ]]; then rematch=${BASH_REMATCH[1]} if [ -n "${testname}" ]; then - $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" + $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$qemu_opts" "$arch" "$machine" "$check" "$accel" "$timeout" fi testname=$rematch smp=1 kernel="" - opts="" + qemu_opts="" groups="" arch="" machine="" @@ -38,24 +61,10 @@ function for_each_unittest() kernel=$TEST_DIR/${BASH_REMATCH[1]} elif [[ $line =~ ^smp\ *=\ *(.*)$ ]]; then smp=${BASH_REMATCH[1]} - elif [[ $line =~ ^extra_params\ *=\ *'"""'(.*)$ ]]; then - opts=${BASH_REMATCH[1]}$'\n' - while read -r -u $fd; do - #escape backslash newline, but not double backslash - if [[ $opts =~ [^\\]*(\\*)$'\n'$ ]]; then - if (( ${#BASH_REMATCH[1]} % 2 == 1 )); then - opts=${opts%\\$'\n'} - fi - fi - if [[ "$REPLY" =~ ^(.*)'"""'[:blank:]*$ ]]; then - opts+=${BASH_REMATCH[1]} - break - else - opts+=$REPLY$'\n' - fi - done - elif [[ $line =~ ^extra_params\ *=\ *(.*)$ ]]; then - opts=${BASH_REMATCH[1]} + elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *'"""'(.*)$ ]]; then + qemu_opts=$(parse_opts ${BASH_REMATCH[2]}$'\n' $fd) + elif [[ $line =~ ^(extra_params|qemu_params)\ *=\ *(.*)$ ]]; then + qemu_opts=${BASH_REMATCH[2]} elif [[ $line =~ ^groups\ *=\ *(.*)$ ]]; then groups=${BASH_REMATCH[1]} elif [[ $line =~ ^arch\ *=\ *(.*)$ ]]; then @@ -71,7 +80,7 @@ function for_each_unittest() fi done if [ -n "${testname}" ]; then - $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$machine" "$check" "$accel" "$timeout" + $(arch_cmd) "$cmd" "$testname" "$groups" "$smp" "$kernel" "$qemu_opts" "$arch" "$machine" "$check" "$accel" "$timeout" fi exec {fd}<&- } diff --git a/scripts/runtime.bash b/scripts/runtime.bash index 4b9c7d6b7c39..e5d661684ceb 100644 --- a/scripts/runtime.bash +++ b/scripts/runtime.bash @@ -34,7 +34,7 @@ premature_failure() get_cmdline() { local kernel=$1 - echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $opts" + echo "TESTNAME=$testname TIMEOUT=$timeout MACHINE=$machine ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $qemu_opts" } skip_nodefault() @@ -80,7 +80,7 @@ function run() local groups="$2" local smp="$3" local kernel="$4" - local opts="$5" + local qemu_opts="$5" local arch="$6" local machine="$7" local check="${CHECK:-$8}" @@ -179,9 +179,9 @@ function run() echo $cmdline fi - # extra_params in the config file may contain backticks that need to be - # expanded, so use eval to start qemu. Use "> >(foo)" instead of a pipe to - # preserve the exit status. + # qemu_params/extra_params in the config file may contain backticks that + # need to be expanded, so use eval to start qemu. Use "> >(foo)" instead of + # a pipe to preserve the exit status. summary=$(eval "$cmdline" 2> >(RUNTIME_log_stderr $testname) \ > >(tee >(RUNTIME_log_stdout $testname $kernel) | extract_summary)) ret=$?
Tests for the arm and arm64 architectures can also be run with kvmtool, and work is under way to have it supported by the run_tests.sh test runner. Not suprisingly, kvmtool has a different syntax than qemu when configuring and running a virtual machine. Add a new unittest parameter, 'qemu_params', with the goal to add a similar parameter for each virtual machine manager that run_tests.sh supports. 'qemu_params' and 'extra_params' are interchangeable, but it is expected that going forward new tests will use 'qemu_params'. A test should have only one of the two parameters. While we're at it, rename the variable opts to qemu_opts to match the new unit configuration name, and to make it easier to distinguish from the kvmtool parameters when they'll be added. Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> --- docs/unittests.txt | 17 +++++++++----- scripts/common.bash | 53 ++++++++++++++++++++++++++------------------ scripts/runtime.bash | 10 ++++----- 3 files changed, 47 insertions(+), 33 deletions(-)