On Wed, Aug 19, 2020 at 12:34 PM +0200, Cornelia Huck <cohuck@xxxxxxxxxx> wrote:
> On Tue, 18 Aug 2020 15:04:24 +0200
> Marc Hartmayer <mhartmay@xxxxxxxxxxxxx> wrote:
>
>> Add support for Protected Virtual Machine (PVM) tests. For starting a
>> PVM guest we must be able to generate a PVM image by using the
>> `genprotimg` tool from the s390-tools collection. This requires the
>> ability to pass a machine-specific host-key document, so the option
>> `--host-key-document` is added to the configure script.
>>
>> Signed-off-by: Marc Hartmayer <mhartmay@xxxxxxxxxxxxx>
>> ---
>> configure | 9 +++++++++
>> s390x/Makefile | 17 +++++++++++++++--
>> s390x/selftest.parmfile | 1 +
>> s390x/unittests.cfg | 1 +
>> scripts/s390x/func.bash | 35 +++++++++++++++++++++++++++++++++++
>> 5 files changed, 61 insertions(+), 2 deletions(-)
>> create mode 100644 s390x/selftest.parmfile
>> create mode 100644 scripts/s390x/func.bash
>
> (...)
>
>> +function arch_cmd_s390x()
>> +{
>> + local cmd=$1
>> + local testname=$2
>> + local groups=$3
>> + local smp=$4
>> + local kernel=$5
>> + local opts=$6
>> + local arch=$7
>> + local check=$8
>> + local accel=$9
>> + local timeout=${10}
>> +
>> + # run the normal test case
>> + "$cmd" "${testname}" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
>> +
>> + # run PV test case
>> + kernel=${kernel%.elf}.pv.bin
>> + if [ ! -f "${kernel}" ]; then
>> + if [ -z "${HOST_KEY_DOCUMENT}" ]; then
>> + print_result 'SKIP' $testname '(no host-key document specified)'
>> + return 2
>> + fi
>> +
>> + print_result 'SKIP' $testname '(PVM image was not created)'
>
> When can that happen? Don't we already fail earlier if we specified a
> host key document, but genprotimg does not work?
./configure
make -j
./configure --host-key-document=…
./run_tests.sh
A contrived example, but…
>
>> + return 2
>> + fi
>> + "$cmd" "${testname}_PV" "$groups pv" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout"
>> +}
>
--
Kind regards / Beste Grüße
Marc Hartmayer
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Gregor Pillen
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
