* [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack
@ 2018-06-19 6:41 Daniel Vetter
2018-06-19 7:05 ` [igt-dev] ✓ Fi.CI.BAT: success for gtkdoc: Remove the build_by_default hack (rev3) Patchwork
2018-06-19 7:56 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Vetter @ 2018-06-19 6:41 UTC (permalink / raw)
To: IGT development; +Cc: Daniel Vetter
meson 0.45 properly supports generated content_files. Except for the
minor issue that we're hitting an internal bug in meson. I've made a
pull request for that
https://github.com/mesonbuild/meson/pull/3189
which has now been addressed in
commit c1f275bfa644beafab9f8572351d4b64d61c148b
Author: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sun May 6 20:09:49 2018 +0530
gnome.gtkdoc: Allow passing file objects as xml_files
If we pass a source files() object, we will look for it in the build
directory, which is wrong. If we pass a build files() object (from
configure_file()), we will find it in the build directory, and then
try to copy it on top of itself in gtkdochelper.py getting a
SameFileError.
Add a test for it, and also properly iterate custom target outputs
when adding to content files.
Downside of this all is that we'd need to up the meson requirements to
something like 0.47, which isn't even released yet :-/
v2: Rebase and also add version requirement.
v3: I figured out how to make this work with a meson version check!
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
docs/reference/igt-gpu-tools/meson.build | 49 ++++++++++++++++--------
meson.build | 2 +-
2 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/docs/reference/igt-gpu-tools/meson.build b/docs/reference/igt-gpu-tools/meson.build
index aadb9af593d9..ebcb6b7a4874 100644
--- a/docs/reference/igt-gpu-tools/meson.build
+++ b/docs/reference/igt-gpu-tools/meson.build
@@ -50,27 +50,46 @@ gen_programs = find_program('generate_programs_xml.sh')
test_list_files = []
-foreach group : test_groups
- programs_xml = 'igt_test_programs_' + group + '_programs.xml'
- custom_target(programs_xml,
- output : programs_xml,
- build_by_default : true,
- command : [ gen_programs, '@OUTPUT@', group, test_list ])
-
- description_xml = 'igt_test_programs_' + group + '_description.xml'
- custom_target(description_xml,
- output : description_xml,
- build_by_default : true,
- depends : test_executables,
- command : [ gen_description, '@OUTPUT@', group, test_list ])
-endforeach
+generated_docs = []
configure_file(input: 'version.xml.in',
output: 'version.xml',
install: false, configuration: config)
+if meson.version().version_compare('>= 0.47')
+ foreach group : test_groups
+ programs_xml = 'igt_test_programs_' + group + '_programs.xml'
+ generated_docs += custom_target(programs_xml,
+ output : programs_xml,
+ command : [ gen_programs, '@OUTPUT@', group, test_list ])
+
+ description_xml = 'igt_test_programs_' + group + '_description.xml'
+ generated_docs += custom_target(description_xml,
+ output : description_xml,
+ depends : test_executables,
+ command : [ gen_description, '@OUTPUT@', group, test_list ])
+ endforeach
+else
+ # older meson needs the build_by_default hack because gtkdoc dependency
+ # handling is broken
+ foreach group : test_groups
+ programs_xml = 'igt_test_programs_' + group + '_programs.xml'
+ custom_target(programs_xml,
+ build_by_default : true,
+ output : programs_xml,
+ command : [ gen_programs, '@OUTPUT@', group, test_list ])
+
+ description_xml = 'igt_test_programs_' + group + '_description.xml'
+ custom_target(description_xml,
+ build_by_default : true,
+ output : description_xml,
+ depends : test_executables,
+ command : [ gen_description, '@OUTPUT@', group, test_list ])
+ endforeach
+endif
+
gnome.gtkdoc('igt-gpu-tools',
- content_files : ['igt_test_programs.xml'],
+ content_files : ['igt_test_programs.xml'] + generated_docs,
dependencies : lib_igt,
install : true,
main_xml : 'igt-gpu-tools-docs.xml',
diff --git a/meson.build b/meson.build
index cd736d8e232a..0509a8f88799 100644
--- a/meson.build
+++ b/meson.build
@@ -5,7 +5,7 @@ project('igt-gpu-tools', 'c',
'c_std=gnu99',
],
license : 'MIT',
- meson_version : '>0.40.0')
+ meson_version : '>0.40')
cc = meson.get_compiler('c')
--
2.17.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for gtkdoc: Remove the build_by_default hack (rev3)
2018-06-19 6:41 [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack Daniel Vetter
@ 2018-06-19 7:05 ` Patchwork
2018-06-19 7:56 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2018-06-19 7:05 UTC (permalink / raw)
To: Daniel Vetter; +Cc: igt-dev
== Series Details ==
Series: gtkdoc: Remove the build_by_default hack (rev3)
URL : https://patchwork.freedesktop.org/series/39455/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4332 -> IGTPW_1479 =
== Summary - WARNING ==
Minor unknown changes coming with IGTPW_1479 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_1479, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/39455/revisions/3/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in IGTPW_1479:
=== IGT changes ===
==== Warnings ====
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c:
fi-glk-j4005: PASS -> SKIP
== Known issues ==
Here are the changes found in IGTPW_1479 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
igt@kms_pipe_crc_basic@nonblocking-crc-pipe-c:
fi-skl-6700hq: PASS -> DMESG-WARN (fdo#105998)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-bxt-dsi: PASS -> INCOMPLETE (fdo#103927)
==== Possible fixes ====
igt@kms_chamelium@dp-edid-read:
fi-kbl-7500u: FAIL (fdo#103841) -> PASS
igt@kms_flip@basic-flip-vs-wf_vblank:
fi-glk-j4005: FAIL (fdo#100368) -> PASS
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-FAIL (fdo#102614, fdo#106103) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106103 https://bugs.freedesktop.org/show_bug.cgi?id=106103
== Participating hosts (40 -> 38) ==
Additional (3): fi-bwr-2160 fi-ilk-650 fi-kbl-r
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* IGT: IGT_4522 -> IGTPW_1479
CI_DRM_4332: 35d2e46192bf51f81d3d474b13cca1a607610843 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_1479: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1479/
IGT_4522: 077c6f7c3786334c5e5c34888ab446fdb4347331 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1479/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 3+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for gtkdoc: Remove the build_by_default hack (rev3)
2018-06-19 6:41 [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack Daniel Vetter
2018-06-19 7:05 ` [igt-dev] ✓ Fi.CI.BAT: success for gtkdoc: Remove the build_by_default hack (rev3) Patchwork
@ 2018-06-19 7:56 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2018-06-19 7:56 UTC (permalink / raw)
To: Daniel Vetter; +Cc: igt-dev
== Series Details ==
Series: gtkdoc: Remove the build_by_default hack (rev3)
URL : https://patchwork.freedesktop.org/series/39455/
State : success
== Summary ==
= CI Bug Log - changes from IGT_4522_full -> IGTPW_1479_full =
== Summary - WARNING ==
Minor unknown changes coming with IGTPW_1479_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in IGTPW_1479_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://patchwork.freedesktop.org/api/1.0/series/39455/revisions/3/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in IGTPW_1479_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-vebox:
shard-kbl: SKIP -> PASS +3
igt@gem_tiled_blits@interruptible:
shard-apl: SKIP -> PASS
igt@kms_atomic@plane_invalid_params_fence:
shard-snb: SKIP -> PASS
== Known issues ==
Here are the changes found in IGTPW_1479_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_hangman@error-state-capture-render:
shard-glk: PASS -> INCOMPLETE (fdo#103359, k.org#198133)
igt@drv_selftest@live_hangcheck:
shard-apl: PASS -> DMESG-FAIL (fdo#106947)
igt@gem_exec_schedule@pi-ringfull-bsd2:
shard-kbl: NOTRUN -> FAIL (fdo#103158)
igt@gem_userptr_blits@process-exit-gtt-busy:
shard-snb: PASS -> INCOMPLETE (fdo#105411)
igt@gem_workarounds@suspend-resume-fd:
shard-kbl: PASS -> DMESG-WARN (fdo#103313)
igt@kms_available_modes_crc@available_mode_test_crc:
shard-glk: NOTRUN -> FAIL (fdo#106641)
shard-kbl: NOTRUN -> FAIL (fdo#106641)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
shard-snb: PASS -> FAIL (fdo#104724, fdo#103166)
igt@kms_rotation_crc@primary-rotation-180:
shard-snb: PASS -> FAIL (fdo#103925, fdo#104724)
igt@kms_setmode@basic:
shard-apl: PASS -> FAIL (fdo#99912)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-glk: FAIL (fdo#105347) -> PASS
shard-apl: FAIL (fdo#105347) -> PASS
igt@gem_ppgtt@blt-vs-render-ctx0:
shard-snb: INCOMPLETE (fdo#105411) -> PASS
igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
shard-glk: FAIL (fdo#100368) -> PASS +1
igt@kms_flip@flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#102887, fdo#105363) -> PASS
igt@kms_flip@modeset-vs-vblank-race:
shard-hsw: FAIL (fdo#103060) -> PASS
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: FAIL (fdo#104724) -> PASS
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS +1
igt@kms_setmode@basic:
shard-hsw: FAIL (fdo#99912) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* IGT: IGT_4522 -> IGTPW_1479
* Linux: CI_DRM_4329 -> CI_DRM_4332
CI_DRM_4329: 02d8db1a894b0e646b2debd64ce24b8e99fd2ffd @ git://anongit.freedesktop.org/gfx-ci/linux
CI_DRM_4332: 35d2e46192bf51f81d3d474b13cca1a607610843 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_1479: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1479/
IGT_4522: 077c6f7c3786334c5e5c34888ab446fdb4347331 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1479/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-19 7:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-19 6:41 [igt-dev] [PATCH i-g-t] gtkdoc: Remove the build_by_default hack Daniel Vetter
2018-06-19 7:05 ` [igt-dev] ✓ Fi.CI.BAT: success for gtkdoc: Remove the build_by_default hack (rev3) Patchwork
2018-06-19 7:56 ` [igt-dev] ✓ Fi.CI.IGT: " 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.