From 9228b9e424554ea3b194275938391875d8340c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Mon, 13 Nov 2023 23:24:06 +0100
Subject: [PATCH] iwyu.yml: fixed `include-what-you-use` job / cleaned up
 includes (#5657)

As usual when the base clang version of a distro changes iwyu ends up
broken and needs additional packages and/or options applied to work
again.
---
 .github/workflows/iwyu.yml   | 2 +-
 cli/singleexecutor.cpp       | 1 -
 test/testprocessexecutor.cpp | 3 ---
 test/testsingleexecutor.cpp  | 3 ---
 test/testthreadexecutor.cpp  | 3 ---
 test/testtokenlist.cpp       | 1 +
 6 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml
index 6dfd0b707..dd6d10278 100644
--- a/.github/workflows/iwyu.yml
+++ b/.github/workflows/iwyu.yml
@@ -83,7 +83,7 @@ jobs:
       - name: iwyu_tool
         run: |
           PWD=$(pwd)
-          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments -Xiwyu --mapping_file=$PWD/qt5.imp > iwyu.log
+          iwyu_tool -p cmake.output -j $(nproc) -- -w -Xiwyu --max_line_length=1024 -Xiwyu --comment_style=long -Xiwyu --quoted_includes_first -Xiwyu --update_comments -Xiwyu --mapping_file=$PWD/qt5.imp -I/usr/lib/clang/17/include > iwyu.log
 
       - uses: actions/upload-artifact@v3
         if: success() || failure()
diff --git a/cli/singleexecutor.cpp b/cli/singleexecutor.cpp
index 4bbc0d707..22d7ad457 100644
--- a/cli/singleexecutor.cpp
+++ b/cli/singleexecutor.cpp
@@ -20,7 +20,6 @@
 
 #include "cppcheck.h"
 #include "filesettings.h"
-#include "library.h"
 #include "settings.h"
 #include "timer.h"
 
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
index 1e69e332e..4e624c02e 100644
--- a/test/testprocessexecutor.cpp
+++ b/test/testprocessexecutor.cpp
@@ -23,14 +23,11 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "timer.h"
-#include "library.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <list>
-#include <map>
 #include <memory>
-#include <set>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/test/testsingleexecutor.cpp b/test/testsingleexecutor.cpp
index f86ab5216..53f9be99e 100644
--- a/test/testsingleexecutor.cpp
+++ b/test/testsingleexecutor.cpp
@@ -21,7 +21,6 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "redirect.h"
-#include "library.h"
 #include "settings.h"
 #include "singleexecutor.h"
 #include "timer.h"
@@ -29,9 +28,7 @@
 #include <algorithm>
 #include <cstdlib>
 #include <list>
-#include <map>
 #include <memory>
-#include <set>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index e1d81a405..f41def335 100644
--- a/test/testthreadexecutor.cpp
+++ b/test/testthreadexecutor.cpp
@@ -21,16 +21,13 @@
 #include "filesettings.h"
 #include "fixture.h"
 #include "helpers.h"
-#include "library.h"
 #include "threadexecutor.h"
 #include "timer.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <list>
-#include <map>
 #include <memory>
-#include <set>
 #include <sstream>
 #include <string>
 #include <utility>
diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
index c1dbcc4dc..2e764608e 100644
--- a/test/testtokenlist.cpp
+++ b/test/testtokenlist.cpp
@@ -19,6 +19,7 @@
 #include "settings.h"
 #include "fixture.h"
 #include "platform.h"
+#include "standards.h"
 #include "token.h"
 #include "tokenlist.h"