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.

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

---

Changes in v4: added a note in NEWS

Also opened https://github.com/mesonbuild/meson/issues/5655

 .gitlab-ci.yml      | 20 ++++++++++----------
 NEWS                |  7 +++++++
 man/meson.build     |  2 +-
 meson.build         | 12 ++++++------
 meson_options.txt   | 22 +++++++++++-----------
 overlay/meson.build |  2 +-
 runner/meson.build  |  2 +-
 7 files changed, 37 insertions(+), 30 deletions(-)

.gitlab-ci.yml +10 -10

index 665fbb79c523..7ed538a4d1fc 100644
@@ -1,14 +1,14 @@
 image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-fedora:latest
 variables:
   MESON_OPTIONS: >
-    -Dwith_libdrm=intel,nouveau,amdgpu
-    -Dbuild_overlay=enabled
-    -Dbuild_chamelium=enabled
-    -Dwith_valgrind=enabled
-    -Dbuild_man=enabled
-    -Dbuild_tests=enabled
-    -Dbuild_runner=enabled
-    -Dwith_libunwind=enabled
+    -Dlibdrm_drivers=intel,nouveau,amdgpu
+    -Doverlay=enabled
+    -Dchamelium=enabled
+    -Dvalgrind=enabled
+    -Dman=enabled
+    -Dtests=enabled
+    -Drunner=enabled
+    -Dlibunwind=enabled
   LANG: "C.UTF-8"
 
 stages:

@@ -33,7 +33,7 @@ build:tests-fedora-no-libunwind:
   stage: build
   script:
     - dnf remove -y libunwind-devel
-    - meson -Dlibunwind=false build
+    - meson -Dlibunwind=disabled build
     - ninja -C build
 
 # documentation building is different with meson<0.47

@@ -72,7 +72,7 @@ build:tests-debian-minimal:
   image: $CI_REGISTRY/$CI_PROJECT_PATH/igt-debian-minimal:latest
   stage: build
   script:
-    - meson -Dbuild_tests=disabled -Dwith_libdrm="" build
+    - meson -Dtests=disabled -Dlibdrm_drivers="" build
     - ninja -C build
   artifacts:
     paths:

NEWS +7 -0

index d94374fa3d78..d4e381e35be3 100644
@@ -1,3 +1,10 @@
+Unreleased
+----------
+
+Meson build options have been renamed. Please check the news options in
+meson_options.txt and make sure you don't get any warnings when configuring the
+project.
+
 Release 1.24 (2019-06-20)
 -------------------------
 

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 -2

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

Quoted 9 lines · Simon Ser

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.

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

---

Quoted 1 line

Changes in v4: added a note in NEWS

I don't know if non-maintainers adding stuff to NEWS is a good idea.

For sway/wlroots, we just create an issue about the next release where all members can comment to append a breaking change/note for the maintainer.

== Series Details ==

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

== Summary ==

CI Bug Log - changes from CI_DRM_6483_full -> IGTPW_3269_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with IGTPW_3269_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in IGTPW_3269_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/63280/revisions/4/mbox/

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_3269_full:

### IGT changes ###

#### Possible regressions ####

* igt@i915_suspend@debugfs-reader:
- shard-iclb: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-iclb1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-iclb6/igt@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_balancer@smoke:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#110854])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-iclb2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-iclb5/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-accuracy:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#110933])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-iclb1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-iclb2/igt@[email protected]

* igt@i915_selftest@live_hangcheck:
- shard-iclb: [PASS][7] -> [INCOMPLETE][8] ([fdo#107713] / [fdo#108569])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-iclb2/igt@i915_selftest@live_hangcheck.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-iclb4/igt@i915_selftest@live_hangcheck.html

* igt@kms_flip@2x-plain-flip-fb-recreate:
- shard-glk: [PASS][9] -> [FAIL][10] ([fdo#100368])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-glk1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-glk6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-pwrite:
- shard-iclb: [PASS][11] -> [FAIL][12] ([fdo#103167]) +3 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-iclb6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-iclb7/igt@[email protected]

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

* igt@kms_setmode@basic:
- shard-kbl: [PASS][15] -> [FAIL][16] ([fdo#99912])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-kbl2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-kbl3/igt@[email protected]

* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-apl: [PASS][17] -> [DMESG-WARN][18] ([fdo#108566]) +6 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-apl5/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-apl5/igt@[email protected]

#### Possible fixes ####

* igt@gem_workarounds@suspend-resume:
- shard-apl: [DMESG-WARN][19] ([fdo#108566]) -> [PASS][20] +4 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-apl4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-apl2/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: [FAIL][21] ([fdo#105363]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-glk8/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-glk6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt:
- shard-iclb: [FAIL][23] ([fdo#103167]) -> [PASS][24] +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-shrfb-plflip-blt.html

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][25] ([fdo#109441]) -> [PASS][26] +4 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-iclb4/igt@kms_psr@psr2_sprite_plane_move.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

* igt@kms_setmode@basic:
- shard-apl: [FAIL][27] ([fdo#99912]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-apl5/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-apl6/igt@[email protected]

* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-snb: [DMESG-WARN][29] ([fdo#102365]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6483/shard-snb7/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/shard-snb1/igt@[email protected]

[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#102365]: https://bugs.freedesktop.org/show_bug.cgi?id=102365
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#110933]: https://bugs.freedesktop.org/show_bug.cgi?id=110933
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912

Participating hosts (10 -> 6)
------------------------------

Missing (4): pig-skl-6260u shard-skl pig-hsw-4770r pig-glk-j5005

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

* IGT: IGT_5098 -> IGTPW_3269
* Piglit: piglit_4509 -> None

CI_DRM_6483: 4aea794468d67b8bd2a6d1fc07e2772007f98540 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3269: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/
IGT_5098: 41ff022b62b45a5b84504daa3537fa1b295b97c9 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3269/

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.

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