From 9f78c7c59134d2671bb1d481d610f8c79a7df8a6 Mon Sep 17 00:00:00 2001 From: Buildbot system user Date: Wed, 4 Dec 2019 15:28:22 +0000 Subject: Use 'meson test --timeout-multiplier' rather than tweaking timeout values Use 'meson test --timeout-multiplier' rather than tweaking timeout values for slow hardware. --- modulesetparser.py | 2 +- ...01-meson-Increase-timeout-for-glcpp-tests.patch | 39 ---------------------- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 patches/mesa-mesa/0001-meson-Increase-timeout-for-glcpp-tests.patch diff --git a/modulesetparser.py b/modulesetparser.py index 458a288..fffe796 100755 --- a/modulesetparser.py +++ b/modulesetparser.py @@ -397,7 +397,7 @@ def BuilderList(slaves): factory.addStep(Configure(command=['meson', '--prefix', Interpolate(prefix), 'build'] + extra, name='meson', description='meson', descriptionDone='meson', logEnviron=logEnviron, env=env, doStepIf=force_configure, hideStepIf=lambda results, s: results==SKIPPED)) factory.addStep(Compile(command=['ninja', '-C', 'build'], logEnviron=logEnviron, env=env)) - factory.addStep(Compile(command=['ninja', '-C', 'build', 'test'], name='test', description='testing', descriptionDone='test', logEnviron=logEnviron, env=env, timeout=3600)) + factory.addStep(Compile(command=['meson', 'test', '-C', 'build', '--timeout-multiplier=4'], name='test', description='testing', descriptionDone='test', logEnviron=logEnviron, env=env, timeout=3600)) factory.addStep(Compile(command=['ninja', '-C', 'build', 'install'], name='install', description='installing', descriptionDone='install', logEnviron=logEnviron, env=env)) # add build step to trigger dependent modules (if any) diff --git a/patches/mesa-mesa/0001-meson-Increase-timeout-for-glcpp-tests.patch b/patches/mesa-mesa/0001-meson-Increase-timeout-for-glcpp-tests.patch deleted file mode 100644 index cb08926..0000000 --- a/patches/mesa-mesa/0001-meson-Increase-timeout-for-glcpp-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5facfdc02085d166fe69f93f0eaad02018732b2e Mon Sep 17 00:00:00 2001 -From: Jon Turney -Date: Thu, 14 Mar 2019 00:15:47 +0000 -Subject: [PATCH] meson: Increase timeout for glcpp tests - -These take a little while, and can exceed the default 30s timeout on -slow hardware. ---- - src/compiler/glsl/glcpp/meson.build | 1 + - src/gallium/drivers/llvmpipe/meson.build | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/compiler/glsl/glcpp/meson.build b/src/compiler/glsl/glcpp/meson.build -index 677baf1df10..5c0de869094 100644 ---- a/src/compiler/glsl/glcpp/meson.build -+++ b/src/compiler/glsl/glcpp/meson.build -@@ -71,6 +71,7 @@ if with_any_opengl and with_tests - '--@0@'.format(m), - ], - suite : ['compiler', 'glcpp'], -+ timeout : 120, - ) - endforeach - endif -diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build -index 51562b10dc7..cfba38070c2 100644 ---- a/src/gallium/drivers/llvmpipe/meson.build -+++ b/src/gallium/drivers/llvmpipe/meson.build -@@ -121,6 +121,7 @@ if with_tests and with_gallium_softpipe and with_llvm - link_with : [libllvmpipe, libgallium, libmesa_util], - ), - suite : ['llvmpipe'], -+ timeout : 120, - ) - endforeach - endif --- -2.17.0 - -- cgit v1.2.3