* [igt-dev] [PATCH i-g-t v2 0/2] Build Xe test documentation
@ 2023-03-20 8:44 Mauro Carvalho Chehab
2023-03-20 8:44 ` [igt-dev] [PATCH i-g-t v2 1/2] meson: build " Mauro Carvalho Chehab
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Mauro Carvalho Chehab @ 2023-03-20 8:44 UTC (permalink / raw)
To: igt-dev
From: Mauro Carvalho Chehab <mchehab@kernel.org>
IGT has gained support for building Xe driver test documentation,
but there are a few left-overs for it to work.
Add the left overs, creating Xe test documentation at build time.
Mauro Carvalho Chehab (2):
meson: build Xe test documentation
testplan: build also a PDF file with the testplan
docs/meson.build | 1 +
docs/testplan/conf.py | 41 ++++++++++++++++++++++++++++++++++++
docs/testplan/meson.build | 27 +++++++++++++++++++-----
docs/testplan/testplan.css | 7 +++++++
meson_options.txt | 8 +++++++
scripts/gen_rst_index | 43 ++++++++++++++++++++++++++++++++++++++
scripts/meson.build | 3 +++
7 files changed, 125 insertions(+), 5 deletions(-)
create mode 100644 docs/testplan/conf.py
create mode 100644 docs/testplan/testplan.css
create mode 100755 scripts/gen_rst_index
--
2.39.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [igt-dev] [PATCH i-g-t v2 1/2] meson: build Xe test documentation
2023-03-20 8:44 [igt-dev] [PATCH i-g-t v2 0/2] Build Xe test documentation Mauro Carvalho Chehab
@ 2023-03-20 8:44 ` Mauro Carvalho Chehab
2023-03-20 17:45 ` Kamil Konieczny
2023-03-20 8:45 ` [igt-dev] [PATCH i-g-t v2 2/2] testplan: build also a PDF file with the testplan Mauro Carvalho Chehab
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Mauro Carvalho Chehab @ 2023-03-20 8:44 UTC (permalink / raw)
To: igt-dev
From: Mauro Carvalho Chehab <mchehab@kernel.org>
Add the remaining changes at meson for it to build Xe documentation.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
docs/meson.build | 1 +
docs/testplan/conf.py | 41 ++++++++++++++++++++++++++++++++++++
docs/testplan/testplan.css | 7 +++++++
meson_options.txt | 8 +++++++
scripts/gen_rst_index | 43 ++++++++++++++++++++++++++++++++++++++
scripts/meson.build | 3 +++
6 files changed, 103 insertions(+)
create mode 100644 docs/testplan/conf.py
create mode 100644 docs/testplan/testplan.css
create mode 100755 scripts/gen_rst_index
diff --git a/docs/meson.build b/docs/meson.build
index ead14c4015d9..01edf64f04a8 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1 +1,2 @@
subdir('reference')
+subdir('testplan')
diff --git a/docs/testplan/conf.py b/docs/testplan/conf.py
new file mode 100644
index 000000000000..26243ff8bd88
--- /dev/null
+++ b/docs/testplan/conf.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+
+import sys
+import os
+from shutil import which
+
+extensions = []
+
+if which('rst2pdf'):
+ extensions.append('rst2pdf.pdfbuilder')
+
+source_suffix = '.rst'
+master_doc = 'index'
+
+project = 'IGT Test Tools'
+copyright = 'Intel'
+author = 'IGT developers'
+language = 'en'
+
+exclude_patterns = []
+todo_include_todos = False
+
+html_theme = "nature"
+
+html_css_files = []
+html_static_path = ['.']
+html_copy_source = False
+
+html_use_smartypants = False
+html_sidebars = { '**': ['searchbox.html', 'localtoc.html']}
+htmlhelp_basename = 'IGT'
+
+html_theme_options = {
+ "body_max_width": "1520px",
+ "sidebarwidth": "400px",
+}
+
+# rst2pdf
+pdf_documents = [
+ ('index', u'xe_tests', u'IGT Xe Tests', u'IGT authors'),
+]
diff --git a/docs/testplan/testplan.css b/docs/testplan/testplan.css
new file mode 100644
index 000000000000..8aa7b7105c19
--- /dev/null
+++ b/docs/testplan/testplan.css
@@ -0,0 +1,7 @@
+@import url(html4css1.css);
+
+.literal {
+ background: lightgrey;
+ color: darkblue;
+ font-size: 14px;
+}
diff --git a/meson_options.txt b/meson_options.txt
index d978813b4feb..d4e373d6cfc4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,6 +20,14 @@ option('man',
type : 'feature',
description : 'Build man pages')
+option('testplan',
+ type : 'feature',
+ description : 'Build testplan documentation pages in ReST and html')
+
+option('sphinx',
+ type : 'feature',
+ description : 'Build testplan documentation using Sphinx')
+
option('docs',
type : 'feature',
description : 'Build documentation')
diff --git a/scripts/gen_rst_index b/scripts/gen_rst_index
new file mode 100755
index 000000000000..34955a35a443
--- /dev/null
+++ b/scripts/gen_rst_index
@@ -0,0 +1,43 @@
+#!/bin/bash -e
+# SPDX-License-Identifier: (GPL-2.0 OR MIT)
+
+## Copyright (C) 2023 Intel Corporation ##
+## Author: Mauro Carvalho Chehab <mchehab@kernel.org> ##
+## ##
+## Small script to produce a ReST index file ##
+
+if [ $# -lt 3 ]; then
+ echo 'Usage: $0: <title> <files> <dest_dir>' >&2
+ exit 1
+fi
+
+title=$1
+shift
+
+args=( "$@" )
+
+dest_dir=${args[${#args[@]}-1]}
+unset args[${#args[@]}-1]
+
+if [ ! -d $dest_dir ]; then
+ echo "Error: $dest_dir directory doesn't exist" >&2
+ exit 1
+fi
+
+dest_file="$dest_dir/index.rst"
+
+echo $title > "$dest_file"
+len=${#title}
+for i in $(seq 1 $len); do
+ echo -n "=" >> "$dest_file"
+done
+echo >> "$dest_file"
+echo >> "$dest_file"
+
+echo ".. toctree::" >> "$dest_file"
+echo " :maxdepth: 1" >> "$dest_file"
+echo >> "$dest_file"
+
+for i in "${!args[@]}"; do
+ echo " ${args[$i]}" >> "$dest_file"
+done
diff --git a/scripts/meson.build b/scripts/meson.build
index 342972e66078..ce12aa02e946 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -11,3 +11,6 @@ if build_tests
install_data(prog, install_dir : bindir, install_mode : 'r-xr-xr-x')
endforeach
endif
+
+igt_doc_script = find_program('igt_doc.py')
+gen_rst_index = find_program('gen_rst_index')
--
2.39.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [igt-dev] [PATCH i-g-t v2 2/2] testplan: build also a PDF file with the testplan
2023-03-20 8:44 [igt-dev] [PATCH i-g-t v2 0/2] Build Xe test documentation Mauro Carvalho Chehab
2023-03-20 8:44 ` [igt-dev] [PATCH i-g-t v2 1/2] meson: build " Mauro Carvalho Chehab
@ 2023-03-20 8:45 ` Mauro Carvalho Chehab
2023-03-20 17:43 ` Kamil Konieczny
2023-03-20 12:15 ` [igt-dev] ✗ GitLab.Pipeline: warning for Build Xe test documentation Patchwork
2023-03-20 12:39 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
3 siblings, 1 reply; 7+ messages in thread
From: Mauro Carvalho Chehab @ 2023-03-20 8:45 UTC (permalink / raw)
To: igt-dev
From: Mauro Carvalho Chehab <mchehab@kernel.org>
PDF files are easier to share, and it costs almost nothing to
produce them with Sphinx using rst2pdf. So, add support for it,
if rst2pdf is installed.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
docs/testplan/meson.build | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build
index 11c08573307e..65bb6c31cd65 100644
--- a/docs/testplan/meson.build
+++ b/docs/testplan/meson.build
@@ -4,6 +4,7 @@ build_testplan = get_option('testplan')
build_sphinx = get_option('sphinx')
rst2html = find_program('rst2html-3', 'rst2html', required : build_testplan)
+rst2pdf = find_program('rst2pdf')
sphinx = find_program('sphinx-build', required: build_sphinx)
stylesheet = meson.current_source_dir() + '/testplan.css'
@@ -46,14 +47,30 @@ if sphinx.found()
)
custom_target('index.html',
- build_by_default : true,
- command : [ 'sphinx-build', '-c', meson.current_source_dir(), meson.current_build_dir(), sphinx_out_dir],
- input : index_rst,
- output : 'index.html'
- )
+ build_by_default : true,
+ command : [ 'sphinx-build', '-c', meson.current_source_dir(),
+ meson.current_build_dir(), sphinx_out_dir],
+ input : index_rst,
+ output : 'index.html'
+ )
+ endif
+
+ if rst2pdf.found()
+ sphinx_out_pdf = meson.current_build_dir() + '/pdf'
+
+ custom_target('xe_tests.pdf',
+ build_by_default : true,
+ command : [ 'sphinx-build', '-c', meson.current_source_dir(),
+ '-b', 'pdf',
+ '-D', 'version=' + meson.project_version(),
+ meson.current_build_dir(), sphinx_out_pdf],
+ input : index_rst,
+ output : 'xe_tests.pdf'
+ )
endif
endif
build_info += 'Build ReST test documentation: @0@'.format(igt_doc_script.found())
build_info += 'Build simple html testplan documentation: @0@'.format(rst2html.found())
build_info += 'Build indexed html testplan documentation: @0@'.format(sphinx.found())
+build_info += 'Build pdf testplan documentation: @0@'.format(sphinx.found() and rst2pdf.found())
--
2.39.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [igt-dev] ✗ GitLab.Pipeline: warning for Build Xe test documentation
2023-03-20 8:44 [igt-dev] [PATCH i-g-t v2 0/2] Build Xe test documentation Mauro Carvalho Chehab
2023-03-20 8:44 ` [igt-dev] [PATCH i-g-t v2 1/2] meson: build " Mauro Carvalho Chehab
2023-03-20 8:45 ` [igt-dev] [PATCH i-g-t v2 2/2] testplan: build also a PDF file with the testplan Mauro Carvalho Chehab
@ 2023-03-20 12:15 ` Patchwork
2023-03-20 12:39 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2023-03-20 12:15 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: igt-dev
== Series Details ==
Series: Build Xe test documentation
URL : https://patchwork.freedesktop.org/series/115373/
State : warning
== Summary ==
Pipeline status: FAILED.
see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/833959 for the overview.
build:tests-fedora has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/38387199):
Program rst2man.sh found: YES (/builds/gfx-ci/igt-ci-tags/man/rst2man.sh)
Program igt_doc.py found: YES (/builds/gfx-ci/igt-ci-tags/scripts/igt_doc.py)
Program gen_rst_index found: YES (/builds/gfx-ci/igt-ci-tags/scripts/gen_rst_index)
Run-time dependency gtk-doc found: YES 1.29
Program generate_description_xml.py found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_description_xml.py)
Program generate_programs_xml.sh found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_programs_xml.sh)
Configuring version.xml using configuration
Program rst2html-3 found: NO
Program rst2html found: YES (/usr/bin/rst2html)
Program rst2pdf found: NO
docs/testplan/meson.build:7:0: ERROR: Program(s) ['rst2pdf'] not found or not executable
A full log can be found at /builds/gfx-ci/igt-ci-tags/build/meson-logs/meson-log.txt
section_end:1679314053:step_script
section_start:1679314053:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1679314053:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora-clang has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/38387203):
Program rst2man.sh found: YES (/builds/gfx-ci/igt-ci-tags/man/rst2man.sh)
Program igt_doc.py found: YES (/builds/gfx-ci/igt-ci-tags/scripts/igt_doc.py)
Program gen_rst_index found: YES (/builds/gfx-ci/igt-ci-tags/scripts/gen_rst_index)
Run-time dependency gtk-doc found: YES 1.29
Program generate_description_xml.py found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_description_xml.py)
Program generate_programs_xml.sh found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_programs_xml.sh)
Configuring version.xml using configuration
Program rst2html-3 found: NO
Program rst2html found: YES (/usr/bin/rst2html)
Program rst2pdf found: NO
docs/testplan/meson.build:7:0: ERROR: Program(s) ['rst2pdf'] not found or not executable
A full log can be found at /builds/gfx-ci/igt-ci-tags/build/meson-logs/meson-log.txt
section_end:1679314060:step_script
section_start:1679314060:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1679314062:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora-no-libdrm-nouveau has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/38387202):
Program rst2man.sh found: YES (/builds/gfx-ci/igt-ci-tags/man/rst2man.sh)
Program igt_doc.py found: YES (/builds/gfx-ci/igt-ci-tags/scripts/igt_doc.py)
Program gen_rst_index found: YES (/builds/gfx-ci/igt-ci-tags/scripts/gen_rst_index)
Run-time dependency gtk-doc found: YES 1.29
Program generate_description_xml.py found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_description_xml.py)
Program generate_programs_xml.sh found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_programs_xml.sh)
Configuring version.xml using configuration
Program rst2html-3 found: NO
Program rst2html found: YES (/usr/bin/rst2html)
Program rst2pdf found: NO
docs/testplan/meson.build:7:0: ERROR: Program(s) ['rst2pdf'] not found or not executable
A full log can be found at /builds/gfx-ci/igt-ci-tags/build/meson-logs/meson-log.txt
section_end:1679314054:step_script
section_start:1679314054:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1679314055:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora-no-libunwind has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/38387200):
Program rst2man.sh found: YES (/builds/gfx-ci/igt-ci-tags/man/rst2man.sh)
Program igt_doc.py found: YES (/builds/gfx-ci/igt-ci-tags/scripts/igt_doc.py)
Program gen_rst_index found: YES (/builds/gfx-ci/igt-ci-tags/scripts/gen_rst_index)
Run-time dependency gtk-doc found: YES 1.29
Program generate_description_xml.py found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_description_xml.py)
Program generate_programs_xml.sh found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_programs_xml.sh)
Configuring version.xml using configuration
Program rst2html-3 found: NO
Program rst2html found: YES (/usr/bin/rst2html)
Program rst2pdf found: NO
docs/testplan/meson.build:7:0: ERROR: Program(s) ['rst2pdf'] not found or not executable
A full log can be found at /builds/gfx-ci/igt-ci-tags/build/meson-logs/meson-log.txt
section_end:1679314055:step_script
section_start:1679314055:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1679314056:cleanup_file_variables
ERROR: Job failed: exit code 1
build:tests-fedora-oldest-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/38387201):
Program rst2man.sh found: YES (/builds/gfx-ci/igt-ci-tags/man/rst2man.sh)
Program igt_doc.py found: YES (/builds/gfx-ci/igt-ci-tags/scripts/igt_doc.py)
Program gen_rst_index found: YES (/builds/gfx-ci/igt-ci-tags/scripts/gen_rst_index)
Native dependency gtk-doc found: YES 1.29
Program generate_description_xml.py found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_description_xml.py)
Program generate_programs_xml.sh found: YES (/builds/gfx-ci/igt-ci-tags/docs/reference/igt-gpu-tools/generate_programs_xml.sh)
Configuring version.xml using configuration
Program rst2html-3 found: NO
Program rst2html found: YES (/usr/bin/rst2html)
Program rst2pdf found: NO
docs/testplan/meson.build:7:0: ERROR: Program(s) ['rst2pdf'] not found or not executable
A full log can be found at /builds/gfx-ci/igt-ci-tags/build/meson-logs/meson-log.txt
section_end:1679314054:step_script
section_start:1679314054:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1679314055:cleanup_file_variables
ERROR: Job failed: exit code 1
== Logs ==
For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/833959
^ permalink raw reply [flat|nested] 7+ messages in thread
* [igt-dev] ✗ Fi.CI.BAT: failure for Build Xe test documentation
2023-03-20 8:44 [igt-dev] [PATCH i-g-t v2 0/2] Build Xe test documentation Mauro Carvalho Chehab
` (2 preceding siblings ...)
2023-03-20 12:15 ` [igt-dev] ✗ GitLab.Pipeline: warning for Build Xe test documentation Patchwork
@ 2023-03-20 12:39 ` Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2023-03-20 12:39 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 8751 bytes --]
== Series Details ==
Series: Build Xe test documentation
URL : https://patchwork.freedesktop.org/series/115373/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12883 -> IGTPW_8641
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with IGTPW_8641 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_8641, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/index.html
Participating hosts (34 -> 35)
------------------------------
Additional (1): bat-atsm-1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_8641:
### IGT changes ###
#### Possible regressions ####
* igt@dmabuf@all-tests@dma_fence:
- fi-tgl-1115g4: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12883/fi-tgl-1115g4/igt@dmabuf@all-tests@dma_fence.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/fi-tgl-1115g4/igt@dmabuf@all-tests@dma_fence.html
* igt@dmabuf@all-tests@sanitycheck:
- fi-tgl-1115g4: [PASS][3] -> [ABORT][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12883/fi-tgl-1115g4/igt@dmabuf@all-tests@sanitycheck.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/fi-tgl-1115g4/igt@dmabuf@all-tests@sanitycheck.html
Known issues
------------
Here are the changes found in IGTPW_8641 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@fbdev@eof:
- bat-atsm-1: NOTRUN -> [SKIP][5] ([i915#2582]) +4 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@fbdev@eof.html
* igt@gem_mmap@basic:
- bat-atsm-1: NOTRUN -> [SKIP][6] ([i915#4083])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@gem_mmap@basic.html
* igt@gem_tiled_fence_blits@basic:
- bat-atsm-1: NOTRUN -> [SKIP][7] ([i915#4077]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@gem_tiled_fence_blits@basic.html
* igt@gem_tiled_pread_basic:
- bat-atsm-1: NOTRUN -> [SKIP][8] ([i915#4079]) +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@gem_tiled_pread_basic.html
* igt@i915_pm_rps@basic-api:
- bat-atsm-1: NOTRUN -> [SKIP][9] ([i915#6621])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@i915_pm_rps@basic-api.html
* igt@i915_selftest@live@migrate:
- bat-dg2-11: [PASS][10] -> [DMESG-WARN][11] ([i915#7699])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12883/bat-dg2-11/igt@i915_selftest@live@migrate.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-dg2-11/igt@i915_selftest@live@migrate.html
* igt@i915_selftest@live@slpc:
- bat-rpls-1: NOTRUN -> [DMESG-FAIL][12] ([i915#6367] / [i915#7996])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-rpls-1/igt@i915_selftest@live@slpc.html
* igt@i915_suspend@basic-s3-without-i915:
- bat-atsm-1: NOTRUN -> [SKIP][13] ([i915#6645])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@i915_suspend@basic-s3-without-i915.html
* igt@kms_addfb_basic@size-max:
- bat-atsm-1: NOTRUN -> [SKIP][14] ([i915#6077]) +36 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@kms_addfb_basic@size-max.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-rpls-1: NOTRUN -> [SKIP][15] ([i915#7828])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-rpls-1/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- bat-atsm-1: NOTRUN -> [SKIP][16] ([i915#6078]) +19 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@kms_cursor_legacy@basic-flip-after-cursor-atomic.html
* igt@kms_flip@basic-plain-flip:
- bat-atsm-1: NOTRUN -> [SKIP][17] ([i915#6166]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@kms_flip@basic-plain-flip.html
* igt@kms_force_connector_basic@prune-stale-modes:
- bat-atsm-1: NOTRUN -> [SKIP][18] ([i915#6093]) +3 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@kms_force_connector_basic@prune-stale-modes.html
* igt@kms_pipe_crc_basic@hang-read-crc:
- bat-atsm-1: NOTRUN -> [SKIP][19] ([i915#1836]) +6 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@kms_pipe_crc_basic@hang-read-crc.html
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-rpls-1: NOTRUN -> [SKIP][20] ([i915#1845])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-rpls-1/igt@kms_pipe_crc_basic@suspend-read-crc.html
* igt@kms_prop_blob@basic:
- bat-atsm-1: NOTRUN -> [SKIP][21] ([i915#7357])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@kms_prop_blob@basic.html
* igt@kms_psr@sprite_plane_onoff:
- bat-atsm-1: NOTRUN -> [SKIP][22] ([i915#1072]) +3 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@kms_psr@sprite_plane_onoff.html
* igt@kms_setmode@basic-clone-single-crtc:
- bat-atsm-1: NOTRUN -> [SKIP][23] ([i915#6094])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-fence-flip:
- bat-atsm-1: NOTRUN -> [SKIP][24] ([fdo#109295] / [i915#6078])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-fence-mmap:
- bat-atsm-1: NOTRUN -> [SKIP][25] ([fdo#109295] / [i915#4077]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@prime_vgem@basic-fence-mmap.html
* igt@prime_vgem@basic-write:
- bat-atsm-1: NOTRUN -> [SKIP][26] ([fdo#109295]) +3 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-atsm-1/igt@prime_vgem@basic-write.html
#### Possible fixes ####
* igt@i915_selftest@live@reset:
- bat-rpls-1: [ABORT][27] ([i915#4983]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12883/bat-rpls-1/igt@i915_selftest@live@reset.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/bat-rpls-1/igt@i915_selftest@live@reset.html
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6077]: https://gitlab.freedesktop.org/drm/intel/issues/6077
[i915#6078]: https://gitlab.freedesktop.org/drm/intel/issues/6078
[i915#6093]: https://gitlab.freedesktop.org/drm/intel/issues/6093
[i915#6094]: https://gitlab.freedesktop.org/drm/intel/issues/6094
[i915#6166]: https://gitlab.freedesktop.org/drm/intel/issues/6166
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#7357]: https://gitlab.freedesktop.org/drm/intel/issues/7357
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_7207 -> IGTPW_8641
CI-20190529: 20190529
CI_DRM_12883: 5619fa2b4a9b93019f6ca27a2f391fc39e152993 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_8641: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/index.html
IGT_7207: 51001c91c367464da9e700e617fb712b3b1cecfd @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8641/index.html
[-- Attachment #2: Type: text/html, Size: 10236 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 2/2] testplan: build also a PDF file with the testplan
2023-03-20 8:45 ` [igt-dev] [PATCH i-g-t v2 2/2] testplan: build also a PDF file with the testplan Mauro Carvalho Chehab
@ 2023-03-20 17:43 ` Kamil Konieczny
0 siblings, 0 replies; 7+ messages in thread
From: Kamil Konieczny @ 2023-03-20 17:43 UTC (permalink / raw)
To: igt-dev
Hi Mauro,
On 2023-03-20 at 09:45:00 +0100, Mauro Carvalho Chehab wrote:
> From: Mauro Carvalho Chehab <mchehab@kernel.org>
>
> PDF files are easier to share, and it costs almost nothing to
> produce them with Sphinx using rst2pdf. So, add support for it,
s/So, add/Added/
s/it,/it/
> if rst2pdf is installed.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> ---
> docs/testplan/meson.build | 27 ++++++++++++++++++++++-----
> 1 file changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/docs/testplan/meson.build b/docs/testplan/meson.build
> index 11c08573307e..65bb6c31cd65 100644
> --- a/docs/testplan/meson.build
> +++ b/docs/testplan/meson.build
> @@ -4,6 +4,7 @@ build_testplan = get_option('testplan')
> build_sphinx = get_option('sphinx')
>
> rst2html = find_program('rst2html-3', 'rst2html', required : build_testplan)
> +rst2pdf = find_program('rst2pdf')
> sphinx = find_program('sphinx-build', required: build_sphinx)
>
> stylesheet = meson.current_source_dir() + '/testplan.css'
> @@ -46,14 +47,30 @@ if sphinx.found()
> )
>
> custom_target('index.html',
> - build_by_default : true,
> - command : [ 'sphinx-build', '-c', meson.current_source_dir(), meson.current_build_dir(), sphinx_out_dir],
> - input : index_rst,
> - output : 'index.html'
> - )
> + build_by_default : true,
> + command : [ 'sphinx-build', '-c', meson.current_source_dir(),
> + meson.current_build_dir(), sphinx_out_dir],
> + input : index_rst,
> + output : 'index.html'
> + )
> + endif
Please do not touch unrelated lines.
> +
> + if rst2pdf.found()
> + sphinx_out_pdf = meson.current_build_dir() + '/pdf'
> +
> + custom_target('xe_tests.pdf',
> + build_by_default : true,
> + command : [ 'sphinx-build', '-c', meson.current_source_dir(),
> + '-b', 'pdf',
> + '-D', 'version=' + meson.project_version(),
> + meson.current_build_dir(), sphinx_out_pdf],
> + input : index_rst,
> + output : 'xe_tests.pdf'
> + )
It seemd build fails when no rst2pdf is present:
Program rst2pdf found: NO
docs/testplan/meson.build:7:0: ERROR: Program 'rst2pdf' not found or not executable
Regards,
Kamil
> endif
> endif
>
> build_info += 'Build ReST test documentation: @0@'.format(igt_doc_script.found())
> build_info += 'Build simple html testplan documentation: @0@'.format(rst2html.found())
> build_info += 'Build indexed html testplan documentation: @0@'.format(sphinx.found())
> +build_info += 'Build pdf testplan documentation: @0@'.format(sphinx.found() and rst2pdf.found())
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2 1/2] meson: build Xe test documentation
2023-03-20 8:44 ` [igt-dev] [PATCH i-g-t v2 1/2] meson: build " Mauro Carvalho Chehab
@ 2023-03-20 17:45 ` Kamil Konieczny
0 siblings, 0 replies; 7+ messages in thread
From: Kamil Konieczny @ 2023-03-20 17:45 UTC (permalink / raw)
To: igt-dev
Hi Mauro,
On 2023-03-20 at 09:44:59 +0100, Mauro Carvalho Chehab wrote:
> From: Mauro Carvalho Chehab <mchehab@kernel.org>
>
> Add the remaining changes at meson for it to build Xe documentation.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> ---
> docs/meson.build | 1 +
> docs/testplan/conf.py | 41 ++++++++++++++++++++++++++++++++++++
> docs/testplan/testplan.css | 7 +++++++
> meson_options.txt | 8 +++++++
> scripts/gen_rst_index | 43 ++++++++++++++++++++++++++++++++++++++
> scripts/meson.build | 3 +++
> 6 files changed, 103 insertions(+)
> create mode 100644 docs/testplan/conf.py
> create mode 100644 docs/testplan/testplan.css
> create mode 100755 scripts/gen_rst_index
>
> diff --git a/docs/meson.build b/docs/meson.build
> index ead14c4015d9..01edf64f04a8 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -1 +1,2 @@
> subdir('reference')
> +subdir('testplan')
> diff --git a/docs/testplan/conf.py b/docs/testplan/conf.py
> new file mode 100644
> index 000000000000..26243ff8bd88
> --- /dev/null
> +++ b/docs/testplan/conf.py
> @@ -0,0 +1,41 @@
> +# -*- coding: utf-8 -*-
> +
imho you should put here SPDX with MIT.
Regards,
Kamil
> +import sys
> +import os
> +from shutil import which
> +
> +extensions = []
> +
> +if which('rst2pdf'):
> + extensions.append('rst2pdf.pdfbuilder')
> +
> +source_suffix = '.rst'
> +master_doc = 'index'
> +
> +project = 'IGT Test Tools'
> +copyright = 'Intel'
> +author = 'IGT developers'
> +language = 'en'
> +
> +exclude_patterns = []
> +todo_include_todos = False
> +
> +html_theme = "nature"
> +
> +html_css_files = []
> +html_static_path = ['.']
> +html_copy_source = False
> +
> +html_use_smartypants = False
> +html_sidebars = { '**': ['searchbox.html', 'localtoc.html']}
> +htmlhelp_basename = 'IGT'
> +
> +html_theme_options = {
> + "body_max_width": "1520px",
> + "sidebarwidth": "400px",
> +}
> +
> +# rst2pdf
> +pdf_documents = [
> + ('index', u'xe_tests', u'IGT Xe Tests', u'IGT authors'),
> +]
> diff --git a/docs/testplan/testplan.css b/docs/testplan/testplan.css
> new file mode 100644
> index 000000000000..8aa7b7105c19
> --- /dev/null
> +++ b/docs/testplan/testplan.css
> @@ -0,0 +1,7 @@
> +@import url(html4css1.css);
> +
> +.literal {
> + background: lightgrey;
> + color: darkblue;
> + font-size: 14px;
> +}
> diff --git a/meson_options.txt b/meson_options.txt
> index d978813b4feb..d4e373d6cfc4 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -20,6 +20,14 @@ option('man',
> type : 'feature',
> description : 'Build man pages')
>
> +option('testplan',
> + type : 'feature',
> + description : 'Build testplan documentation pages in ReST and html')
> +
> +option('sphinx',
> + type : 'feature',
> + description : 'Build testplan documentation using Sphinx')
> +
> option('docs',
> type : 'feature',
> description : 'Build documentation')
> diff --git a/scripts/gen_rst_index b/scripts/gen_rst_index
> new file mode 100755
> index 000000000000..34955a35a443
> --- /dev/null
> +++ b/scripts/gen_rst_index
> @@ -0,0 +1,43 @@
> +#!/bin/bash -e
> +# SPDX-License-Identifier: (GPL-2.0 OR MIT)
> +
> +## Copyright (C) 2023 Intel Corporation ##
> +## Author: Mauro Carvalho Chehab <mchehab@kernel.org> ##
> +## ##
> +## Small script to produce a ReST index file ##
> +
> +if [ $# -lt 3 ]; then
> + echo 'Usage: $0: <title> <files> <dest_dir>' >&2
> + exit 1
> +fi
> +
> +title=$1
> +shift
> +
> +args=( "$@" )
> +
> +dest_dir=${args[${#args[@]}-1]}
> +unset args[${#args[@]}-1]
> +
> +if [ ! -d $dest_dir ]; then
> + echo "Error: $dest_dir directory doesn't exist" >&2
> + exit 1
> +fi
> +
> +dest_file="$dest_dir/index.rst"
> +
> +echo $title > "$dest_file"
> +len=${#title}
> +for i in $(seq 1 $len); do
> + echo -n "=" >> "$dest_file"
> +done
> +echo >> "$dest_file"
> +echo >> "$dest_file"
> +
> +echo ".. toctree::" >> "$dest_file"
> +echo " :maxdepth: 1" >> "$dest_file"
> +echo >> "$dest_file"
> +
> +for i in "${!args[@]}"; do
> + echo " ${args[$i]}" >> "$dest_file"
> +done
> diff --git a/scripts/meson.build b/scripts/meson.build
> index 342972e66078..ce12aa02e946 100644
> --- a/scripts/meson.build
> +++ b/scripts/meson.build
> @@ -11,3 +11,6 @@ if build_tests
> install_data(prog, install_dir : bindir, install_mode : 'r-xr-xr-x')
> endforeach
> endif
> +
> +igt_doc_script = find_program('igt_doc.py')
> +gen_rst_index = find_program('gen_rst_index')
> --
> 2.39.2
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-03-20 17:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-20 8:44 [igt-dev] [PATCH i-g-t v2 0/2] Build Xe test documentation Mauro Carvalho Chehab
2023-03-20 8:44 ` [igt-dev] [PATCH i-g-t v2 1/2] meson: build " Mauro Carvalho Chehab
2023-03-20 17:45 ` Kamil Konieczny
2023-03-20 8:45 ` [igt-dev] [PATCH i-g-t v2 2/2] testplan: build also a PDF file with the testplan Mauro Carvalho Chehab
2023-03-20 17:43 ` Kamil Konieczny
2023-03-20 12:15 ` [igt-dev] ✗ GitLab.Pipeline: warning for Build Xe test documentation Patchwork
2023-03-20 12:39 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.