Message ID | 20190528135144.24028-1-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | tests/migration: Disable /migration/postcopy/unix qtest on Travis-CI | expand |
* Philippe Mathieu-Daudé (philmd@redhat.com) wrote: > This started to fail 6 months ago [1] and lately occurs too > often on the main Travis CI. > > Travis CI set the CONTINUOUS_INTEGRATION variable in the process > environment [2]. Let's use it to disable it when running this test > there. > > [1] https://travis-ci.org/philmd/qemu/jobs/466594203#L4430 > [2] https://docs.travis-ci.com/user/environment-variables/#default-environment-variables I think the right solution here is to disable it under TCG. Dave > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/migration-test.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/tests/migration-test.c b/tests/migration-test.c > index bd3f5c3125..c5091e1fb1 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -764,6 +764,11 @@ static void test_postcopy(void) > { > QTestState *from, *to; > > + if (getenv("CONTINUOUS_INTEGRATION")) { > + /* Test failing on Travis-CI */ > + g_test_skip("Running on Travis-CI"); > + } > + > if (migrate_postcopy_prepare(&from, &to, false)) { > return; > } > -- > 2.20.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On 28/05/2019 16:42, Dr. David Alan Gilbert wrote: > * Philippe Mathieu-Daudé (philmd@redhat.com) wrote: >> This started to fail 6 months ago [1] and lately occurs too >> often on the main Travis CI. >> >> Travis CI set the CONTINUOUS_INTEGRATION variable in the process >> environment [2]. Let's use it to disable it when running this test >> there. >> >> [1] https://travis-ci.org/philmd/qemu/jobs/466594203#L4430 >> [2] https://docs.travis-ci.com/user/environment-variables/#default-environment-variables > > I think the right solution here is to disable it under TCG. > For example, it's already done for ppc64 and s390x: d254b392cb10 tests/migration-test: Disable s390x test when running with TCG 5fd4a9c97397 tests/migration: Skip tests for ppc tcg You need the same for aarch64 since: c02b37814cf6 tests: Add migration test for aarch64 Thanks, Laurent
diff --git a/tests/migration-test.c b/tests/migration-test.c index bd3f5c3125..c5091e1fb1 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -764,6 +764,11 @@ static void test_postcopy(void) { QTestState *from, *to; + if (getenv("CONTINUOUS_INTEGRATION")) { + /* Test failing on Travis-CI */ + g_test_skip("Running on Travis-CI"); + } + if (migrate_postcopy_prepare(&from, &to, false)) { return; }
This started to fail 6 months ago [1] and lately occurs too often on the main Travis CI. Travis CI set the CONTINUOUS_INTEGRATION variable in the process environment [2]. Let's use it to disable it when running this test there. [1] https://travis-ci.org/philmd/qemu/jobs/466594203#L4430 [2] https://docs.travis-ci.com/user/environment-variables/#default-environment-variables Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- tests/migration-test.c | 5 +++++ 1 file changed, 5 insertions(+)