From c086c2bbb6a0ae5be6c095c98f377b37511b4755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Michalak-Szmaci=C5=84ski?= <d.michalak@samsung.com>
Date: Fri, 18 Nov 2022 13:26:13 +0100
Subject: [PATCH] Add some rules to IWYU mapping files and fix logging in
 iwyu_check.py script

---
 scripts/helpers/iwyu_check.py            |  8 ++++----
 scripts/helpers/platforms/Linux/iwyu.imp |  2 --
 scripts/helpers/platforms/Tizen/iwyu.imp | 12 ------------
 scripts/helpers/platforms/iwyu.imp       | 11 +++++++++++
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/scripts/helpers/iwyu_check.py b/scripts/helpers/iwyu_check.py
index 3058c193be4ac9..c1c85dbb6ac1da 100755
--- a/scripts/helpers/iwyu_check.py
+++ b/scripts/helpers/iwyu_check.py
@@ -156,7 +156,7 @@ def main(compile_commands_glob, scanning_destination, mapping_file_dir, iwyu_arg
             clang_args
         ]
 
-        logging.info("Start scanning include using IWYU for %s platform" % platform)
+        logging.info("Start scanning include using IWYU for %s platform", platform)
         status = subprocess.Popen(" ".join(command_arr),
                                   shell=True,
                                   text=True,
@@ -170,13 +170,13 @@ def main(compile_commands_glob, scanning_destination, mapping_file_dir, iwyu_arg
             line = status.stdout.readline().rstrip()
 
             if re.match(r"^.*([A-Za-z0-9]+(/[A-Za-z0-9]+)+)\.cpp should [a-zA-Z]+ these lines:$", line):
-                logging.warning("\n"+line)
+                logging.warning("\n%s", line)
 
             elif re.match(r"^.*([A-Za-z0-9]+(/[A-Za-z0-9]+)+)\.[a-zA-Z]+ has correct #includes/fwd-decls\)$", line):
-                logging.info("\n"+line)
+                logging.info("\n%s", line)
 
             elif re.match(r"^The full include-list for .*$", line):
-                logging.warning("\n"+line)
+                logging.warning("\n%s", line)
                 warning_in_files += 1
 
             else:
diff --git a/scripts/helpers/platforms/Linux/iwyu.imp b/scripts/helpers/platforms/Linux/iwyu.imp
index 679f2418e431af..0364fe5e198361 100644
--- a/scripts/helpers/platforms/Linux/iwyu.imp
+++ b/scripts/helpers/platforms/Linux/iwyu.imp
@@ -1,5 +1,3 @@
 [
     { ref: "../iwyu.imp" },
-    { include: [ '"platform/Linux/CHIPDevicePlatformConfig.h"', "private", '<platform/CHIPDeviceConfig.h>', "public" ] },
-    { include: [ '"platform/Linux/SystemPlatformConfig.h"', "private", '<system/SystemConfig.h>', "public" ] },
 ]
diff --git a/scripts/helpers/platforms/Tizen/iwyu.imp b/scripts/helpers/platforms/Tizen/iwyu.imp
index df32ad1145441d..c18fa7ad78ea89 100644
--- a/scripts/helpers/platforms/Tizen/iwyu.imp
+++ b/scripts/helpers/platforms/Tizen/iwyu.imp
@@ -1,18 +1,6 @@
 [
     { ref: "../iwyu.imp" },
 
-    { include: [ '"platform/Tizen/CHIPDevicePlatformConfig.h"', "private", '<platform/CHIPDeviceConfig.h>', "public" ] },
-    { include: [ '"platform/Tizen/SystemPlatformConfig.h"', "private", '<system/SystemConfig.h>', "public" ] },
-
-    ## Do not include some Impl headers directly
-    { include: [ '"platform/Tizen/BLEManagerImpl.h"', "private", '<platform/internal/BLEManager.h>', "public" ] },
-    { include: [ '"platform/Tizen/ConnectivityManagerImpl.h"', "private", '<platform/ConnectivityManager.h>', "public" ] },
-    { include: [ '"platform/Tizen/PlatformManagerImpl.h"', "private", '<platform/PlatformManager.h>', "public" ] },
-    { include: [ '"platform/Tizen/KeyValueStoreManagerImpl.h"', "private", '<platform/KeyValueStoreManager.h>', "public" ] },
-    { include: [ '<platform/Tizen/ThreadStackManagerImpl.h>', "private", '<platform/ThreadStackManager.h>', "public" ] },
-
-    { include: [ '<platform/Tizen/DeviceInstanceInfoProviderImpl.h>', "private", '"platform/Tizen/DeviceInstanceInfoProviderImpl.h"', "public" ] },
-
     { include: [ '<thread-type.h>', "private", '<thread.h>', "public" ] },
     { include: [ '<tizen_error.h>', "private", '<tizen.h>', "public" ] },
 
diff --git a/scripts/helpers/platforms/iwyu.imp b/scripts/helpers/platforms/iwyu.imp
index 6a8fcd8451b7cc..7e3952ff1176ca 100644
--- a/scripts/helpers/platforms/iwyu.imp
+++ b/scripts/helpers/platforms/iwyu.imp
@@ -78,4 +78,15 @@
     { symbol: [ 'tm', private, '<sys/time.h>', public ] },
     { symbol: [ 'declval', 'private', '<utility>', 'public' ] },
 
+    ## Do not include some Impl headers directly
+    { include: [ '@"platform/.*/BLEManagerImpl.h"', "private", '<platform/internal/BLEManager.h>', "public" ] },
+    { include: [ '@"platform/.*/ConnectivityManagerImpl.h"', "private", '<platform/ConnectivityManager.h>', "public" ] },
+    { include: [ '@"platform/.*/PlatformManagerImpl.h"', "private", '<platform/PlatformManager.h>', "public" ] },
+    { include: [ '@"platform/.*/KeyValueStoreManagerImpl.h"', "private", '<platform/KeyValueStoreManager.h>', "public" ] },
+    { include: [ '@<platform/.*/ThreadStackManagerImpl.h>', "private", '<platform/ThreadStackManager.h>', "public" ] },
+
+    ## Config
+    { include: [ '@"platform/.*/CHIPDevicePlatformConfig.h"', "private", '<platform/CHIPDeviceConfig.h>', "public" ] },
+    { include: [ '@"platform/.*/SystemPlatformConfig.h"', "private", '<system/SystemConfig.h>', "public" ] },
+
 ]