Regres: Use 'default' dEQP target and skip GLES daily tests
Using -DDEQP_TARGET=x11_egl caused a build error on some systems:
/usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o: in function `_start':
(.text+0x20): undefined reference to `main'
Using 'default' instead makes the build succeed, and makes XCB WSI tests
pass. However, GLES tests crash. Since we no longer need them due to
SwANGLE, with SwiftShader becoming Vulkan-only, this change removes them
from the test run. Also, the dEQP build is reduced to just the deqp-vk
target.
Lastly, code coverage generation on 'daily' test runs is disabled. It
produced errors such as:
Failed to process test coverage for test 'dEQP-VK.***'.
llvm-profdata errored. Cause: exit status 1
It was already disabled locally on the Regres bot to avoid these
errors.
Bug: b/189469951
Bug: b/152192800
Change-Id: I07383e1168cc322bb9247ed39db091f91c054b6d
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/54589
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/tests/regres/cmd/regres/main.go b/tests/regres/cmd/regres/main.go
index 8281493..963aced 100644
--- a/tests/regres/cmd/regres/main.go
+++ b/tests/regres/cmd/regres/main.go
@@ -516,13 +516,15 @@
}
if err := shell.Shell(buildTimeout, r.cmake, buildDir,
- "-DDEQP_TARGET=x11_egl",
+ "-DDEQP_TARGET=default",
"-DCMAKE_BUILD_TYPE=Release",
".."); err != nil {
return deqpBuild{}, cause.Wrap(err, "Couldn't generate build rules for deqp %v @ %v", cfg.Remote, cfg.SHA)
}
- if err := shell.Shell(buildTimeout, r.make, buildDir, fmt.Sprintf("-j%d", runtime.NumCPU())); err != nil {
+ if err := shell.Shell(buildTimeout, r.make, buildDir,
+ fmt.Sprintf("-j%d", runtime.NumCPU()),
+ "deqp-vk"); err != nil {
return deqpBuild{}, cause.Wrap(err, "Couldn't build deqp %v @ %v", cfg.Remote, cfg.SHA)
}
@@ -616,6 +618,9 @@
// information will be generated for the run, and commiteed to the
// coverageBranch.
func (r *regres) runDaily(client *gerrit.Client, reactorBackend reactorBackend, genCov bool) error {
+ // TODO(b/152192800): Generating coverage data is currently broken.
+ genCov = false
+
log.Printf("Updating test lists (Backend: %v)\n", reactorBackend)
if genCov {
diff --git a/tests/regres/full-tests.json b/tests/regres/full-tests.json
index 13124f0..a643577 100644
--- a/tests/regres/full-tests.json
+++ b/tests/regres/full-tests.json
@@ -1,9 +1,4 @@
[
- { "name": "gles2-master", "api": "gles2", "tests": "testlists/gles2-master.txt" },
-
- { "name": "gles3-565-no-depth-no-stencil", "api": "gles3", "tests": "testlists/gles3-565-no-depth-no-stencil.txt" },
- { "name": "gles3-master", "api": "gles3", "tests": "testlists/gles3-master.txt" },
-
{ "name": "vulkan-wsi", "api": "vulkan", "tests": "testlists/vk-wsi.txt" },
{ "name": "vulkan-master", "api": "vulkan", "tests": "testlists/vk-master.txt" }
]
