mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
piglit: upgrade to latest revision
(From OE-Core rev: e83fe417cfba54d6fb7bc96e7fdf5b870ade81d1) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
bc691128d8
commit
ac56787371
-31
@@ -1,31 +0,0 @@
|
||||
From 9086d42df1f3134bafcfe33ff16db7bbb9d9a0fd Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 30 Nov 2020 23:08:22 +0000
|
||||
Subject: [PATCH] framework/profile.py: make test lists reproducible
|
||||
|
||||
These are created with os.walk, which yields different
|
||||
order depending on where it's run.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
framework/profile.py | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/framework/profile.py b/framework/profile.py
|
||||
index c210e535e..9b5d51d68 100644
|
||||
--- a/framework/profile.py
|
||||
+++ b/framework/profile.py
|
||||
@@ -528,7 +528,11 @@ class TestProfile(object):
|
||||
else:
|
||||
opts[n] = self.test_list[n]
|
||||
else:
|
||||
- opts = self.test_list # pylint: disable=redefined-variable-type
|
||||
+ opts = collections.OrderedDict()
|
||||
+ test_keys = list(self.test_list.keys())
|
||||
+ test_keys.sort()
|
||||
+ for k in test_keys:
|
||||
+ opts[k] = self.test_list[k]
|
||||
|
||||
for k, v in self.filters.run(opts.items()):
|
||||
yield k, v
|
||||
-44
@@ -1,44 +0,0 @@
|
||||
From 1b23539aece156f6fe0789cb988f22e5915228f6 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 10 Nov 2020 17:12:32 +0000
|
||||
Subject: [PATCH 1/2] generated_tests/gen_tcs/tes_input_tests.py: do not
|
||||
hardcode the full binary path
|
||||
|
||||
This helps reproducibility.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
generated_tests/gen_tcs_input_tests.py | 2 +-
|
||||
generated_tests/gen_tes_input_tests.py | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/generated_tests/gen_tcs_input_tests.py b/generated_tests/gen_tcs_input_tests.py
|
||||
index face4f19a..e36671af4 100644
|
||||
--- a/generated_tests/gen_tcs_input_tests.py
|
||||
+++ b/generated_tests/gen_tcs_input_tests.py
|
||||
@@ -272,7 +272,7 @@ class Test(object):
|
||||
relative probe rgb (0.75, 0.75) (0.0, 1.0, 0.0)
|
||||
""")
|
||||
|
||||
- test = test.format(self=self, generator_command=" ".join(sys.argv))
|
||||
+ test = test.format(self=self, generator_command="generated_tests/gen_tcs_input_tests.py")
|
||||
|
||||
filename = self.filename()
|
||||
dirname = os.path.dirname(filename)
|
||||
diff --git a/generated_tests/gen_tes_input_tests.py b/generated_tests/gen_tes_input_tests.py
|
||||
index 3d847b5cc..954840b20 100644
|
||||
--- a/generated_tests/gen_tes_input_tests.py
|
||||
+++ b/generated_tests/gen_tes_input_tests.py
|
||||
@@ -301,7 +301,7 @@ class Test(object):
|
||||
relative probe rgb (0.75, 0.75) (0.0, 1.0, 0.0)
|
||||
""")
|
||||
|
||||
- test = test.format(self=self, generator_command=" ".join(sys.argv))
|
||||
+ test = test.format(self=self, generator_command="generated_tests/gen_tes_input_tests.py")
|
||||
|
||||
filename = self.filename()
|
||||
dirname = os.path.dirname(filename)
|
||||
--
|
||||
2.17.1
|
||||
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
From 1919bb7f4072d73dcbb64d0e06eff5b04529c3db Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 16 Nov 2020 18:01:02 +0000
|
||||
Subject: [PATCH] serializer.py: make .gz files reproducible
|
||||
|
||||
.gz format contains mtime of the compressed data, and
|
||||
SOURCE_DATE_EPOCH is the standard way to make it reproducuble.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
tests/serializer.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/serializer.py b/tests/serializer.py
|
||||
index bd14bc3db..bc5b45d7f 100644
|
||||
--- a/tests/serializer.py
|
||||
+++ b/tests/serializer.py
|
||||
@@ -138,7 +138,10 @@ def serializer(name, profile, outfile):
|
||||
et.SubElement(env, 'env', name=k, value=v)
|
||||
|
||||
tree = et.ElementTree(root)
|
||||
- with gzip.open(outfile, 'wb') as f:
|
||||
+ reproducible_mtime = None
|
||||
+ if 'SOURCE_DATE_EPOCH' in os.environ:
|
||||
+ reproducible_mtime=os.environ['SOURCE_DATE_EPOCH']
|
||||
+ with gzip.GzipFile(outfile, 'wb', mtime=reproducible_mtime) as f:
|
||||
tree.write(f, encoding='utf-8', xml_declaration=True)
|
||||
|
||||
|
||||
-28
@@ -1,28 +0,0 @@
|
||||
From 5bf89c6a314952313b2b762fff0d5501fe57ac53 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 2 Dec 2020 21:21:52 +0000
|
||||
Subject: [PATCH] tests/shader.py: sort the file list before working on it
|
||||
|
||||
This allows later xml output to be reproducible.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/610]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
tests/shader.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/shader.py b/tests/shader.py
|
||||
index 849273660..e6e65d1ba 100644
|
||||
--- a/tests/shader.py
|
||||
+++ b/tests/shader.py
|
||||
@@ -52,7 +52,9 @@ for basedir in [TESTS_DIR, GENERATED_TESTS_DIR]:
|
||||
for group, files in shader_tests.items():
|
||||
assert group not in profile.test_list, 'duplicate group: {}'.format(group)
|
||||
|
||||
- # We'll end up with a list of tuples, split that into two lists
|
||||
+ # This makes the xml output reproducible, as os.walk() order is random
|
||||
+ files.sort()
|
||||
+ # We'll end up with a list of tuples, split that into two list
|
||||
files, installedfiles = list(zip(*files))
|
||||
files = list(files)
|
||||
installedfiles = list(installedfiles)
|
||||
@@ -10,15 +10,11 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
|
||||
file://0001-cmake-install-bash-completions-in-the-right-place.patch \
|
||||
file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \
|
||||
file://0001-Add-a-missing-include-for-htobe32-definition.patch \
|
||||
file://0001-generated_tests-gen_tcs-tes_input_tests.py-do-not-ha.patch \
|
||||
file://0002-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \
|
||||
file://0001-serializer.py-make-.gz-files-reproducible.patch \
|
||||
file://0001-framework-profile.py-make-test-lists-reproducible.patch \
|
||||
file://0001-tests-shader.py-sort-the-file-list-before-working-on.patch \
|
||||
"
|
||||
UPSTREAM_CHECK_COMMITS = "1"
|
||||
|
||||
SRCREV = "11ee10ba04a95d4b36ef844420f0a5838002b5a8"
|
||||
SRCREV = "f328af2ddd0d1bab0f3d149373a36657b252b337"
|
||||
# (when PV goes above 1.0 remove the trailing r)
|
||||
PV = "1.0+gitr${SRCPV}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user