From 3c13ef1d8fc945b8ffe896d31484807ffe9eb811c64e7bb5b1302c4594278cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 29 Aug 2018 08:14:32 +0000 Subject: [PATCH 1/2] Accepting request 632097 from home:mimi_vx:branches:benchmark - use %make_jobs makro instead make_build OBS-URL: https://build.opensuse.org/request/show/632097 OBS-URL: https://build.opensuse.org/package/show/benchmark/piglit?expand=0&rev=16 --- piglit.changes | 5 +++++ piglit.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/piglit.changes b/piglit.changes index 160c8b5..94eaf16 100644 --- a/piglit.changes +++ b/piglit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 29 08:13:34 UTC 2018 - Ondřej Súkup + +- use %make_jobs makro instead make_build + ------------------------------------------------------------------- Wed Jun 6 14:30:34 UTC 2018 - mpluskal@suse.com diff --git a/piglit.spec b/piglit.spec index 98805ef..7e267b5 100644 --- a/piglit.spec +++ b/piglit.spec @@ -113,7 +113,7 @@ be generated, including the ability to compare different test runs. -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ -Wno-dev -%make_build +%make_jobs %install %cmake_install From 340fb6a911835caad77ae6979b458321b9c612ebfbce44dd4bd787b5addbbaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 30 Aug 2018 08:33:04 +0000 Subject: [PATCH 2/2] Accepting request 632265 from home:michalsrb:branches:benchmark - Update suse_qa.py and opensuse_qa.py to work with current piglit. OBS-URL: https://build.opensuse.org/request/show/632265 OBS-URL: https://build.opensuse.org/package/show/benchmark/piglit?expand=0&rev=17 --- opensuse_qa.py | 5 ++--- piglit.changes | 5 +++++ suse_qa.py | 5 ++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/opensuse_qa.py b/opensuse_qa.py index aff5702..883240f 100644 --- a/opensuse_qa.py +++ b/opensuse_qa.py @@ -6,12 +6,11 @@ from __future__ import ( absolute_import, division, print_function, unicode_literals ) -from tests.quick import profile as _profile -from framework.test import GLSLParserTest +from framework.profile import load_test_profile __all__ = ['profile'] -profile = _profile.copy() # pylint: disable=invalid-name +profile = load_test_profile('quick') with open("/usr/lib64/piglit/tests/opensuse_qa-skip-tests.txt") as f: to_skip = frozenset(map(lambda line: line[:-1], f)) diff --git a/piglit.changes b/piglit.changes index 94eaf16..a599919 100644 --- a/piglit.changes +++ b/piglit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 30 08:27:10 UTC 2018 - msrb@suse.com + +- Update suse_qa.py and opensuse_qa.py to work with current piglit. + ------------------------------------------------------------------- Wed Aug 29 08:13:34 UTC 2018 - Ondřej Súkup diff --git a/suse_qa.py b/suse_qa.py index 5bb8c59..311ddbb 100644 --- a/suse_qa.py +++ b/suse_qa.py @@ -6,12 +6,11 @@ from __future__ import ( absolute_import, division, print_function, unicode_literals ) -from tests.quick import profile as _profile -from framework.test import GLSLParserTest +from framework.profile import load_test_profile __all__ = ['profile'] -profile = _profile.copy() # pylint: disable=invalid-name +profile = load_test_profile('quick') with open("/usr/lib64/piglit/tests/suse_qa-skip-tests.txt") as f: to_skip = frozenset(map(lambda line: line[:-1], f))