From 66c57963aaf09a1c41056bd2a001da1d51957a14 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Tue, 17 Dec 2019 15:08:09 +0100 Subject: [PATCH] ci: Update piglit good commit and add new results v2: - Force X11 EGL platform. The compile time platform is drm, but this doesn't work for "spec/egl_khr_create_context/valid debug flag" and the other piglits seem to force X11. - Create a html summary and add it to the artifacts Fixes piglits: spec/egl_khr_create_context/valid debug flag gles[23] Signed-off-by: Gert Wollny Reviewed-by: Lepton Wu --- ci/Dockerfile | 2 +- ci/previous_results/es_host_softpipe/piglit_gles3/results.txt | 1 + ci/previous_results/gl_host_softpipe/piglit_gles3/results.txt | 1 + ci/run_test_suite.sh | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 21b3b66..68ee71c 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -131,7 +131,7 @@ RUN git clone --shallow-since="$GIT_DATE" https://github.com/KhronosGroup/VK-GL- WORKDIR / ARG KNOWN_GOOD_PIGLIT -ENV KNOWN_GOOD_PIGLIT ${KNOWN_GOOD_PIGLIT:-213a01051a907e6e50cc70d141427aab96884c22} +ENV KNOWN_GOOD_PIGLIT ${KNOWN_GOOD_PIGLIT:-603cfb97542a411e8957a0d689d8b28cf8b9ef4d} WORKDIR /piglit RUN git clone --shallow-since="$GIT_DATE" https://gitlab.freedesktop.org/mesa/piglit.git . && \ git checkout ${KNOWN_GOOD_PIGLIT} && \ diff --git a/ci/previous_results/es_host_softpipe/piglit_gles3/results.txt b/ci/previous_results/es_host_softpipe/piglit_gles3/results.txt index 614788b..2e37fe8 100644 --- a/ci/previous_results/es_host_softpipe/piglit_gles3/results.txt +++ b/ci/previous_results/es_host_softpipe/piglit_gles3/results.txt @@ -11,6 +11,7 @@ spec/!opengl es 3.0/oes_compressed_etc2_texture-miptree_gles3 srgb8-punchthrough spec/amd_framebuffer_multisample_advanced/api-gles3: skip spec/arb_blend_func_extended/arb_blend_func_extended-bindfragdataindexed-invalid-parameters_gles3: pass spec/arb_blend_func_extended/arb_blend_func_extended-dual-src-blending-discard-without-src1_gles3: pass +spec/arb_blend_func_extended/arb_blend_func_extended-dual-src-blending-issue-1917_gles3: pass spec/arb_blend_func_extended/arb_blend_func_extended-fbo-extended-blend-explicit_gles3: pass spec/arb_blend_func_extended/arb_blend_func_extended-fbo-extended-blend-pattern_gles3: pass spec/arb_blend_func_extended/arb_blend_func_extended-fbo-extended-blend_gles3: pass diff --git a/ci/previous_results/gl_host_softpipe/piglit_gles3/results.txt b/ci/previous_results/gl_host_softpipe/piglit_gles3/results.txt index 614788b..2e37fe8 100644 --- a/ci/previous_results/gl_host_softpipe/piglit_gles3/results.txt +++ b/ci/previous_results/gl_host_softpipe/piglit_gles3/results.txt @@ -11,6 +11,7 @@ spec/!opengl es 3.0/oes_compressed_etc2_texture-miptree_gles3 srgb8-punchthrough spec/amd_framebuffer_multisample_advanced/api-gles3: skip spec/arb_blend_func_extended/arb_blend_func_extended-bindfragdataindexed-invalid-parameters_gles3: pass spec/arb_blend_func_extended/arb_blend_func_extended-dual-src-blending-discard-without-src1_gles3: pass +spec/arb_blend_func_extended/arb_blend_func_extended-dual-src-blending-issue-1917_gles3: pass spec/arb_blend_func_extended/arb_blend_func_extended-fbo-extended-blend-explicit_gles3: pass spec/arb_blend_func_extended/arb_blend_func_extended-fbo-extended-blend-pattern_gles3: pass spec/arb_blend_func_extended/arb_blend_func_extended-fbo-extended-blend_gles3: pass diff --git a/ci/run_test_suite.sh b/ci/run_test_suite.sh index 83cb801..f51607d 100755 --- a/ci/run_test_suite.sh +++ b/ci/run_test_suite.sh @@ -241,6 +241,7 @@ run_test_suite() fi + EGL_PLATFORM=x11 \ piglit run --platform x11_egl \ -l verbose \ --jobs $NUM_THREADS \ @@ -250,6 +251,8 @@ run_test_suite() piglit summary console /tmp/ | grep -B 999999 "summary:" | grep -v "summary:" > "$RES_FILE" + piglit summary html $(dirname "$RES_FILE")/summary /tmp + TOTAL_TESTS=$(cat $RES_FILE | wc -l) PASSED_TESTS=$(grep " pass" $RES_FILE | wc -l) ;;