On 1/19/20 1:28 AM, Niek Linnenbank wrote: > Hi Philippe, > > For some reason, I can't apply this patch with git am: > > Applying: .travis.yml: Allow untrusted code and large files > error: patch failed: .travis.yml:260 > error: .travis.yml: patch does not apply > Patch failed at 0001 .travis.yml: Allow untrusted code and large files > Use 'git am --show-current-patch' to see the failed patch > > I didn't change the .travis.yml file. I'm using latest master from > commit 7fb38daf256bd1bcbcb5ea556422283d0d55a1b1
I described on the series cover but forgot to remember it here too, this is because this series is based on your v3: Based-on: <20200108200020.4745-1-nieklinnenb...@gmail.com> "Add Allwinner H3 SoC and Orange Pi PC Machine" v3 https://www.mail-archive.com/qemu-devel@nongnu.org/msg669328.html I'll respin a v2 of this single patch, don't worry. Regards, Phil. > Regards, > Niek > > On Sat, Jan 18, 2020 at 8:16 PM Philippe Mathieu-Daudé <f4...@amsat.org > <mailto:f4...@amsat.org>> wrote: > > As Travis CI runs our tests in a disposable environment, we don't > care much if the binaries are trusted. The more we test the better. > > Also, as of this commmit, the smallest available announced [1] is > "approx 18GB", plenty of space to run our acceptance tests. > > Enable the proper environment variables to allow Avocado download > from untrusted sources, and to download large files. > > Note: As of this commit, all our tests "Ran for 17 min 7 sec" > before succeeding, see [2]. > > [1] > > https://docs.travis-ci.com/user/reference/overview/#virtualisation-environment-vs-operating-system > [2] https://travis-ci.org/philmd/qemu/jobs/638823612#L3817 > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org > <mailto:f4...@amsat.org>> > --- > .travis.yml | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/.travis.yml b/.travis.yml > index 638fba4799..b8b9df65a6 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -260,6 +260,8 @@ matrix: > > # Acceptance (Functional) tests > - env: > + - AVOCADO_ALLOW_LARGE_STORAGE="yes" > + - AVOCADO_ALLOW_UNTRUSTED_CODE="sure" > - CONFIG="--python=/usr/bin/python3 > > --target-list=x86_64-softmmu,mips-softmmu,mips64el-softmmu,aarch64-softmmu,arm-softmmu,s390x-softmmu,alpha-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,sparc-softmmu" > - TEST_CMD="make check-acceptance" > after_failure: > -- > 2.21.1 > > > > -- > Niek Linnenbank >
