Re: [kvm-unit-tests PATCH 0/3] s390x: More emulation tests

[David Hildenbrand <david@redhat.com>]

On 21.08.19 10:48, Janosch Frank wrote:
> On 8/20/19 9:04 PM, David Hildenbrand wrote:
>> On 20.08.19 12:55, Janosch Frank wrote:
>>> The first patch allows for CECSIM booting via PSW restart.
>>> The other ones add diag288 and STSI tests.
>>>
>>> I chose to start with these since they are low controversy. My queue
>>> still contains the sclp patches and a simple smp library with
>>> tests. They will follow later.
>>
>> On which branch do these patches apply? I fail to am 2+3 on master (well
>> I didn't try too hard to resolve ;) ). Do you have a branch somewhere?
>>
> 
> That is currently on top of master (24efc22), the only merge conflicts
> might be s390x/Makefile or unittests.conf if your branch is not clean.
> I'm trying to get a public github account for that and qemu.
> 

t460s: ~/git/kvm-unit-tests master $ git fetch origin
t460s: ~/git/kvm-unit-tests master $ git reset --hard origin/master
HEAD is now at 03b1e45 x86: Support environments without test-devices
t460s: ~/git/kvm-unit-tests master $ git am \[kvm-unit-tests\ PATCH\ *
Applying: s390x: Support PSW restart boot
Applying: s390x: Diag288 test
error: patch failed: s390x/Makefile:11
error: s390x/Makefile: patch does not apply
error: patch failed: s390x/unittests.cfg:61
error: s390x/unittests.cfg: patch does not apply
Patch failed at 0002 s390x: Diag288 test
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Are you sure?

-- 

Thanks,

David / dhildenb