build: rename Meson options

PATCH Superseded Simon Ser 2 participants 4 messages Jul 11, 2019 – Jul 12, 2019 Arm/Amlogic Meson SoC support

lore

Share & tools

lore

Simon Ser

author

2019-07-11 11:33 UTC #0 lore raw

PATCH v2 1/1 build: rename Meson options

Meson emits a warning because we use options beginning with "build_":

DEPRECATION: Option uses prefix "build_", which is reserved for Meson. This will become an error in the future.

Rename our options so that we don't use the Meson-reserved prefix.

v2: dropped "While at it, also make other build descriptions more consistent"

Signed-off-by Simon Ser <[email protected]>

---
 man/meson.build     |  2 +-
 meson.build         | 12 ++++++------
 meson_options.txt   | 22 +++++++++++-----------
 overlay/meson.build |  2 +-
 runner/meson.build  |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

man/meson.build +1 -1

index 2c1396af2738..2187e8c505c1 100644
@@ -1,4 +1,4 @@
-build_man = get_option('build_man')
+build_man = get_option('man')
 
 manpages = [
 	'intel_aubdump',

meson.build +6 -6

index 0629d441d0d1..478869eb671f 100644
@@ -77,10 +77,10 @@ foreach cc_arg : cc_args
   endif
 endforeach
 
-build_chamelium = get_option('build_chamelium')
-build_docs = get_option('build_docs')
-build_tests = not get_option('build_tests').disabled()
-with_libdrm = get_option('with_libdrm')
+build_chamelium = get_option('chamelium')
+build_docs = get_option('docs')
+build_tests = not get_option('tests').disabled()
+with_libdrm = get_option('libdrm_drivers')
 
 build_info = ['Build type: ' + get_option('buildtype')]

@@ -118,13 +118,13 @@ pciaccess = dependency('pciaccess', version : '>=0.10')
 libkmod = dependency('libkmod')
 libprocps = dependency('libprocps', required : true)
 
-libunwind = dependency('libunwind', required : get_option('with_libunwind'))
+libunwind = dependency('libunwind', required : get_option('libunwind'))
 build_info += 'With libunwind: @0@'.format(libunwind.found())
 
 libdw = dependency('libdw', required : true)
 pixman = dependency('pixman-1', required : true)
 
-valgrind = dependency('valgrind', required : get_option('with_valgrind'))
+valgrind = dependency('valgrind', required : get_option('valgrind'))
 if valgrind.found()
 	config.set('HAVE_VALGRIND', 1)
 endif

meson_options.txt +11 ~~-11~~

index 9cca0c4f47eb..8e2e1cf07cbe 100644
@@ -1,6 +1,6 @@
-option('build_overlay',
+option('overlay',
        type : 'feature',
-       description : 'Build overlay')
+       description : 'Build overlay tool')
 
 option('overlay_backends',
        type : 'array',

@@ -8,37 +8,37 @@ option('overlay_backends',
        choices : [ 'auto', 'x', 'xv' ],
        description : 'Overlay backends to enable')
 
-option('build_chamelium',
+option('chamelium',
        type : 'feature',
-       description : 'Build chamelium test')
+       description : 'Build Chamelium test')
 
-option('with_valgrind',
+option('valgrind',
        type : 'feature',
        description : 'Build with support for valgrind annotations')
 
-option('build_man',
+option('man',
        type : 'feature',
        description : 'Build man pages')
 
-option('build_docs',
+option('docs',
        type : 'feature',
        description : 'Build documentation')
 
-option('build_tests',
+option('tests',
        type : 'feature',
        description : 'Build tests')
 
-option('with_libdrm',
+option('libdrm_drivers',
        type : 'array',
        value : ['auto'],
        choices : ['', 'auto', 'intel', 'nouveau', 'amdgpu'],
        description : 'libdrm libraries to be used')
 
-option('with_libunwind',
+option('libunwind',
        type : 'feature',
        description : 'Use libunwind')
 
-option('build_runner',
+option('runner',
        type : 'feature',
        description : 'Build test runner')

overlay/meson.build +1 -1

index d2d2b16a8d1b..0a99076206c3 100644
@@ -1,4 +1,4 @@
-build_overlay = get_option('build_overlay')
+build_overlay = get_option('overlay')
 overlay_backends = get_option('overlay_backends')
 
 gpu_overlay_src = [

runner/meson.build +1 -1

index 4eff193afa8d..86521f94d88a 100644
@@ -1,4 +1,4 @@
-build_runner = get_option('build_runner')
+build_runner = get_option('runner')
 
 runnerlib_sources = [ 'settings.c',
 		      'job_list.c',

--
2.22.0

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2019-07-11 12:19 UTC #1 lore raw

[igt-dev] ✗ GitLab.Pipeline: warning for build: rename Meson options (rev2)

== Series Details ==

Series: build: rename Meson options (rev2)
URL : https://patchwork.freedesktop.org/series/63280/
State : warning

== Summary ==

Pipeline status: FAILED.

See https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/48076 for more details.

== Logs ==

For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/pipelines/48076
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2019-07-11 16:20 UTC #2 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for build: rename Meson options (rev2)

In reply to Simon Ser

== Series Details ==

Series: build: rename Meson options (rev2)
URL : https://patchwork.freedesktop.org/series/63280/
State : success

== Summary ==

CI Bug Log - changes from IGT_5094 -> IGTPW_3258
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/63280/revisions/2/mbox/

Known issues
------------

Here are the changes found in IGTPW_3258 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_create@basic-files:
- fi-icl-u3: [PASS][1] -> [INCOMPLETE][2] ([fdo#107713] / [fdo#109100])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/fi-icl-u3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/fi-icl-u3/igt@[email protected]

* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [PASS][3] -> [INCOMPLETE][4] ([fdo#107718])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/fi-blb-e6850/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/fi-blb-e6850/igt@[email protected]

#### Possible fixes ####

* igt@i915_pm_rpm@basic-rte:
- fi-icl-dsi: [INCOMPLETE][5] ([fdo#107713] / [fdo#108840]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/fi-icl-dsi/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/fi-icl-dsi/igt@[email protected]

* igt@i915_selftest@live_contexts:
- fi-skl-iommu: [INCOMPLETE][7] ([fdo#111050]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/fi-skl-iommu/igt@i915_selftest@live_contexts.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/fi-skl-iommu/igt@i915_selftest@live_contexts.html

* igt@i915_selftest@live_execlists:
- fi-bwr-2160: [DMESG-WARN][9] -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/fi-bwr-2160/igt@i915_selftest@live_execlists.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/fi-bwr-2160/igt@i915_selftest@live_execlists.html

* igt@i915_selftest@live_hangcheck:
- fi-bwr-2160: [DMESG-FAIL][11] -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/fi-bwr-2160/igt@i915_selftest@live_hangcheck.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/fi-bwr-2160/igt@i915_selftest@live_hangcheck.html

* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][13] ([fdo#102614]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/fi-hsw-peppy/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/fi-hsw-peppy/igt@[email protected]
- fi-icl-u2: [FAIL][15] ([fdo#103167]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/fi-icl-u2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/fi-icl-u2/igt@[email protected]

[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#111050]: https://bugs.freedesktop.org/show_bug.cgi?id=111050

Participating hosts (53 -> 47)
------------------------------

Missing (6): fi-kbl-soraka fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* IGT: IGT_5094 -> IGTPW_3258

CI_DRM_6458: fe4d1459b31768c40f907bb859f25197e1af2d07 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3258: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/
IGT_5094: d7f140b5b02d054183a74842b4579cf7f5533927 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2019-07-12 12:33 UTC #3 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for build: rename Meson options (rev2)

In reply to Simon Ser

== Series Details ==

Series: build: rename Meson options (rev2)
URL : https://patchwork.freedesktop.org/series/63280/
State : success

== Summary ==

CI Bug Log - changes from IGT_5094_full -> IGTPW_3258_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/63280/revisions/2/mbox/

Known issues
------------

Here are the changes found in IGTPW_3258_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#110854])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-iclb2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-iclb3/igt@[email protected]

* igt@i915_pm_rpm@fences-dpms:
- shard-glk: [PASS][3] -> [INCOMPLETE][4] ([fdo#103359] / [k.org#198133])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-glk4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-glk2/igt@[email protected]

* igt@i915_suspend@debugfs-reader:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +8 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-apl2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-apl7/igt@[email protected]

* igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen:
- shard-apl: [PASS][7] -> [FAIL][8] ([fdo#103232])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-apl2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-apl8/igt@[email protected]
- shard-kbl: [PASS][9] -> [FAIL][10] ([fdo#103232])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-kbl3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-kbl2/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank:
- shard-glk: [PASS][11] -> [FAIL][12] ([fdo#105363])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-glk5/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-glk5/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-hsw: [PASS][13] -> [INCOMPLETE][14] ([fdo#103540])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-hsw5/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-hsw2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-glk: [PASS][15] -> [FAIL][16] ([fdo#103167] / [fdo#110378])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-glk2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-glk4/igt@[email protected]
- shard-kbl: [PASS][17] -> [FAIL][18] ([fdo#103167] / [fdo#110378])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-kbl2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-kbl3/igt@[email protected]
- shard-apl: [PASS][19] -> [FAIL][20] ([fdo#103167] / [fdo#110378])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-apl8/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-apl8/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-blt:
- shard-iclb: [PASS][21] -> [FAIL][22] ([fdo#103167])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-blt.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-offscren-pri-shrfb-draw-blt.html

* igt@kms_plane_cursor@pipe-a-primary-size-128:
- shard-snb: [PASS][23] -> [SKIP][24] ([fdo#109271]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-snb7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-snb5/igt@[email protected]

* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109642] / [fdo#111068])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-iclb2/igt@kms_psr2_su@page_flip.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-iclb8/igt@kms_psr2_su@page_flip.html

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109441]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-iclb5/igt@kms_psr@psr2_sprite_plane_move.html

#### Possible fixes ####

* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][29] ([fdo#108566]) -> [PASS][30] +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-apl7/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-apl8/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-accuracy:
- shard-snb: [SKIP][31] ([fdo#109271]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-snb7/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-snb4/igt@[email protected]

* igt@i915_pm_rpm@i2c:
- shard-hsw: [FAIL][33] ([fdo#104097]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-hsw5/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-hsw1/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-iclb: [FAIL][35] ([fdo#103167]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-mmap-gtt.html

* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [FAIL][37] ([fdo#103166]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-iclb1/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-iclb6/igt@[email protected]

* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [SKIP][39] ([fdo#109441]) -> [PASS][40] +3 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-iclb3/igt@kms_psr@psr2_no_drrs.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-iclb2/igt@kms_psr@psr2_no_drrs.html

#### Warnings ####

* igt@gem_mmap_gtt@forked-basic-small-copy-odd:
- shard-iclb: [INCOMPLETE][41] ([fdo#107713]) -> [FAIL][42] ([fdo#110882])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5094/shard-iclb4/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3258/shard-iclb8/igt@[email protected]

Participating hosts (7 -> 6)
------------------------------

Missing (1): shard-skl

Build changes
-------------

* IGT: IGT_5094 -> IGTPW_3258

== Logs ==