Commit 19b5c879 authored by clayton craft's avatar clayton craft

piglit-test-simdrm: Add hook-up for piglit-test to run simdrm

This adds a new sim-drm project for building sim-drm, and a new version
of piglit-test (piglit-test-simdrm) for running piglit with simdrm.
parent cf2cb3b5
......@@ -37,6 +37,8 @@
<project name="android-buildtest"/>
<project name="sim-drm"/>
<project name="drm"/>
<project name="mesa">
......@@ -129,6 +131,15 @@
<project name="piglit-test"
bisect_hardware="bdw,skl,hsw,ivb,snb,bsw,byt,g965,ilk,g33,g45,bxt,kbl,glk,cfl"
bisect_arch="m64,m32">
<prerequisite name="sim-drm" hardware="builder" arch="m64"/>
<prerequisite name="piglit" hardware="builder"/>
<prerequisite name="mesa" hardware="builder"/>
</project>
<project name="piglit-test-internal"
bisect_hardware="tgl"
bisect_arch="m64">
<prerequisite name="sim-drm" hardware="builder" arch="m64"/>
<prerequisite name="piglit" hardware="builder"/>
<prerequisite name="mesa" hardware="builder"/>
</project>
......@@ -138,6 +149,7 @@
<prerequisite name="mesa" hardware="builder"/>
</project>
<project name="piglit-full">
<prerequisite name="piglit-test"
hardware="snb,ivb,hsw,bdw,skl,kbl"
......@@ -217,6 +229,10 @@
<prerequisite name="glescts-full"/>
</project>
<project name="test-single-arch-internal">
<prerequisite name="piglit-test-internal" hardware="tgl" shard="6" arch="m64"/>
</project>
<project name="test-single-arch-vulkan">
<prerequisite name="test-single-arch"/>
<prerequisite name="vulkancts-full"/>
......
#!/usr/bin/python
import sys, os, argparse
sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])),
"..", "repos", "mesa_ci"))
import build_support as bs
fs = bs.Fulsim()
class SlowTimeout:
def __init__(self):
self.hardware = bs.Options().hardware
def GetDuration(self):
# Simulated platforms need more time
if self.hardware in fs.platform_configs:
return 120
# all other test suites finish in 10 minutes or less.
# TODO: put back to 25 when curro's regression is fixed
return 40
# add the --piglit_test option to the standard options. Parse the
# options, and strip the piglit_test so the options will work as usual
# for subsequent objects.
o = bs.CustomOptions("piglit args allow a specific test")
o.add_argument(arg='--piglit_test', type=str, default="",
help="single piglit test to run.")
o.parse_args()
piglit_test = ""
if o.piglit_test:
piglit_test = o.piglit_test
piglit_timeout = 120
if bs.Options().hardware in fs.platform_configs and not fs.is_supported():
print("Unable to run simulated hardware in this environment!")
sys.exit(1)
bs.build(bs.PiglitTester(_suite="gpu", env=fs.get_env(), timeout=piglit_timeout,
piglit_test=piglit_test), time_limit=SlowTimeout())
......@@ -4,6 +4,9 @@ import sys, os, argparse
sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), "..", "repos", "mesa_ci"))
import build_support as bs
fs = bs.Fulsim()
class SlowTimeout:
def __init__(self):
self.hardware = bs.Options().hardware
......@@ -23,6 +26,8 @@ class SlowTimeout:
return 120
if self.hardware == "g965":
return 50
if self.hardware in fs.platform_configs:
return 120
# all other test suites finish in 10 minutes or less.
# TODO: put back to 25 when curro's regression is fixed
return 40
......@@ -38,7 +43,11 @@ o.parse_args()
piglit_test = ""
if o.piglit_test:
piglit_test = o.piglit_test
piglit_timeout = 120
if bs.Options().hardware in fs.platform_configs and not fs.is_supported():
print("Unable to run simulated hardware in this environment!")
sys.exit(1)
bs.build(bs.PiglitTester(_suite="gpu",
piglit_test=piglit_test),
time_limit=SlowTimeout())
bs.build(bs.PiglitTester(_suite="gpu", env=fs.get_env(), timeout=piglit_timeout,
piglit_test=piglit_test), time_limit=SlowTimeout())
#!/usr/bin/python
import sys
import os.path as path
sys.path.append(path.join(path.dirname(path.abspath(sys.argv[0])), "..",
"repos", "mesa_ci"))
import build_support as bs
def main():
if bs.Options().arch != "m64":
print("Unsupported arch (%s), not building sim-drm!"
% bs.Options().arch)
sys.exit(1)
b = bs.builders.MesonBuilder(install=True)
bs.build(b)
if __name__ == '__main__':
main()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment