commit 516e22fe84f77c2d029b028785dfd1e5633267b5
author Patrick Williams <patrick@stwcx.xyz> Sat Feb 01 08:37:12 2025 -0500
committer Shawn McCarney <shawnmm@us.ibm.com> Tue Feb 04 16:57:23 2025 +0000
tree 161fc9a8e160a586228ca6d52f1b8de5a598fa47
parent 92261f88729b618b1c31d20f28328a8aff73b83b

meson: reformat with meson formatter

Apply the `meson format` results.

Change-Id: Ie0fb147f556c18eb226736dd9b688afba5636a9b
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

phosphor-regulators/meson.build

diff --git a/phosphor-regulators/meson.build b/phosphor-regulators/meson.build
index a9a3dd5..6432c39 100644
--- a/phosphor-regulators/meson.build
+++ b/phosphor-regulators/meson.build
@@ -1,6 +1,8 @@
-install_subdir('config_files',
+install_subdir(
+    'config_files',
     strip_directory: true,
-    install_dir: get_option('datadir')/'phosphor-regulators')
+    install_dir: get_option('datadir') / 'phosphor-regulators',
+)
 
 subdir('src')
 

phosphor-regulators/src/meson.build

diff --git a/phosphor-regulators/src/meson.build b/phosphor-regulators/src/meson.build
index e1552fe..9025278 100644
--- a/phosphor-regulators/src/meson.build
+++ b/phosphor-regulators/src/meson.build
@@ -1,7 +1,7 @@
 phosphor_regulators_include_directories = include_directories(
     '.',
     '../..',
-    'actions'
+    'actions',
 )
 
 phosphor_regulators_library_source_files = [
@@ -25,7 +25,6 @@
     'sensor_monitoring.cpp',
     'system.cpp',
     'vpd.cpp',
-
     'actions/compare_presence_action.cpp',
     'actions/compare_vpd_action.cpp',
     'actions/if_action.cpp',
@@ -37,7 +36,7 @@
     'actions/i2c_write_byte_action.cpp',
     'actions/i2c_write_bytes_action.cpp',
     'actions/pmbus_read_sensor_action.cpp',
-    'actions/pmbus_write_vout_command_action.cpp'
+    'actions/pmbus_write_vout_command_action.cpp',
 ]
 
 phosphor_regulators_library = static_library(
@@ -50,10 +49,7 @@
         phosphor_logging,
         sdbusplus,
     ],
-    include_directories: [
-        phosphor_regulators_include_directories,
-        libi2c_inc
-    ]
+    include_directories: [phosphor_regulators_include_directories, libi2c_inc],
 )
 
 phosphor_regulators = executable(
@@ -69,21 +65,15 @@
         sdeventplus,
         stdplus,
     ],
-    link_with: [
-        phosphor_regulators_library,
-        libpower
-    ],
+    link_with: [phosphor_regulators_library, libpower],
     implicit_include_directories: false,
     include_directories: phosphor_regulators_include_directories,
-    install: true
+    install: true,
 )
 
 regsctl = executable(
     'regsctl',
     'regsctl/main.cpp',
-    dependencies: [
-        cli11_dep,
-        sdbusplus,
-    ],
-    install: true
+    dependencies: [cli11_dep, sdbusplus],
+    install: true,
 )

phosphor-regulators/test/meson.build

diff --git a/phosphor-regulators/test/meson.build b/phosphor-regulators/test/meson.build
index 3373abb..3db580f 100644
--- a/phosphor-regulators/test/meson.build
+++ b/phosphor-regulators/test/meson.build
@@ -1,6 +1,6 @@
 phosphor_regulators_tests_include_directories = include_directories(
     '.',
-    'actions'
+    'actions',
 )
 
 phosphor_regulators_tests_source_files = [
@@ -25,7 +25,6 @@
     'sensors_tests.cpp',
     'system_tests.cpp',
     'write_verification_error_tests.cpp',
-
     'actions/action_environment_tests.cpp',
     'actions/action_error_tests.cpp',
     'actions/action_utils_tests.cpp',
@@ -47,7 +46,7 @@
     'actions/pmbus_read_sensor_action_tests.cpp',
     'actions/pmbus_write_vout_command_action_tests.cpp',
     'actions/run_rule_action_tests.cpp',
-    'actions/set_device_action_tests.cpp'
+    'actions/set_device_action_tests.cpp',
 ]
 
 # Long-running tests that are excluded from CI
@@ -56,31 +55,29 @@
     phosphor_regulators_tests_source_files += 'validate-regulators-config_tests.cpp'
 endif
 
-test('phosphor-regulators-tests',
-     executable('phosphor-regulators-tests',
-                phosphor_regulators_tests_source_files,
-                dependencies: [
-                    gmock,
-                    gtest,
-                    nlohmann_json_dep,
-                    phosphor_dbus_interfaces,
-                    phosphor_logging,
-                    sdbusplus,
-                ],
-                link_args: dynamic_linker,
-                build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
-                link_with: [
-                    phosphor_regulators_library,
-                    libi2c_dev_mock,
-                    libpower
-                ],
-                implicit_include_directories: false,
-                include_directories: [
-                    phosphor_regulators_include_directories,
-                    phosphor_regulators_tests_include_directories,
-                    libi2c_inc,
-                    libi2c_dev_mock_inc
-                ]
-     ),
-     timeout : 180
+test(
+    'phosphor-regulators-tests',
+    executable(
+        'phosphor-regulators-tests',
+        phosphor_regulators_tests_source_files,
+        dependencies: [
+            gmock,
+            gtest,
+            nlohmann_json_dep,
+            phosphor_dbus_interfaces,
+            phosphor_logging,
+            sdbusplus,
+        ],
+        link_args: dynamic_linker,
+        build_rpath: get_option('oe-sdk').allowed() ? rpath : '',
+        link_with: [phosphor_regulators_library, libi2c_dev_mock, libpower],
+        implicit_include_directories: false,
+        include_directories: [
+            phosphor_regulators_include_directories,
+            phosphor_regulators_tests_include_directories,
+            libi2c_inc,
+            libi2c_dev_mock_inc,
+        ],
+    ),
+    timeout: 180,
 )