Diff of the two buildlogs:

--
--- b1/build.log	2023-05-26 21:21:20.845675285 +0000
+++ b2/build.log	2023-05-26 21:34:10.444011538 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Fri May 26 08:58:50 -12 2023
-I: pbuilder-time-stamp: 1685134730
+I: Current time: Sat May 27 11:21:35 +14 2023
+I: pbuilder-time-stamp: 1685136095
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz]
 I: copying local configuration
@@ -16,7 +16,7 @@
 I: copying [./iwyu_8.18.orig.tar.gz]
 I: copying [./iwyu_8.18-2.debian.tar.xz]
 I: Extracting source
-gpgv: Signature made Wed Aug 10 08:44:08 2022 -12
+gpgv: Signature made Thu Aug 11 10:44:08 2022 +14
 gpgv:                using RSA key B60DB5994D39BEC4D1A95CCF7E6528DA752F1BE1
 gpgv: Can't check signature: No public key
 dpkg-source: warning: cannot verify inline signature for ./iwyu_8.18-2.dsc: no acceptable signature found
@@ -27,135 +27,167 @@
 dpkg-source: info: applying python3.diff
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/3656/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/17943/tmp/hooks/D01_modify_environment starting
+debug: Running on virt64a.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 May 27 11:21 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/17943/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/17943/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='armhf'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 '
-  DISTRIBUTION='bookworm'
-  HOME='/root'
-  HOST_ARCH='armhf'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="15" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf")
+  BASH_VERSION='5.2.15(1)-release'
+  BUILDDIR=/build
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=armhf
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4 '
+  DIRSTACK=()
+  DISTRIBUTION=bookworm
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=arm
+  HOST_ARCH=armhf
   IFS=' 	
   '
-  INVOCATION_ID='d7b9ed2281374a71acbeabf73cc7ce46'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='3656'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=9960b3bded514aa7844284e9f465a21f
+  LANG=C
+  LANGUAGE=it_CH:it
+  LC_ALL=C
+  MACHTYPE=arm-unknown-linux-gnueabihf
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnueabihf
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=17943
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.9cD1pnpo/pbuilderrc_XEK3 --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.9cD1pnpo/b1 --logfile b1/build.log iwyu_8.18-2.dsc'
-  SUDO_GID='113'
-  SUDO_UID='107'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://10.0.0.15:3142/'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.9cD1pnpo/pbuilderrc_9mGb --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.9cD1pnpo/b2 --logfile b2/build.log --extrapackages usrmerge iwyu_8.18-2.dsc'
+  SUDO_GID=114
+  SUDO_UID=108
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://10.0.0.15:3142/
 I: uname -a
-  Linux virt32a 5.10.0-23-armmp-lpae #1 SMP Debian 5.10.179-1 (2023-05-12) armv7l GNU/Linux
+  Linux i-capture-the-hostname 5.10.0-23-arm64 #1 SMP Debian 5.10.179-1 (2023-05-12) aarch64 GNU/Linux
 I: ls -l /bin
   total 5072
-  -rwxr-xr-x 1 root root 838488 Apr 23 09:24 bash
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bunzip2
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bzcat
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzcmp -> bzdiff
-  -rwxr-xr-x 1 root root   2225 Sep 18  2022 bzdiff
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzegrep -> bzgrep
-  -rwxr-xr-x 1 root root   4893 Nov 27  2021 bzexe
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzfgrep -> bzgrep
-  -rwxr-xr-x 1 root root   3775 Sep 18  2022 bzgrep
-  -rwxr-xr-x 3 root root  67144 Sep 18  2022 bzip2
-  -rwxr-xr-x 1 root root  67112 Sep 18  2022 bzip2recover
-  lrwxrwxrwx 1 root root      6 Sep 18  2022 bzless -> bzmore
-  -rwxr-xr-x 1 root root   1297 Sep 18  2022 bzmore
-  -rwxr-xr-x 1 root root  67632 Sep 20  2022 cat
-  -rwxr-xr-x 1 root root  67676 Sep 20  2022 chgrp
-  -rwxr-xr-x 1 root root  67644 Sep 20  2022 chmod
-  -rwxr-xr-x 1 root root  67684 Sep 20  2022 chown
-  -rwxr-xr-x 1 root root 133532 Sep 20  2022 cp
-  -rwxr-xr-x 1 root root 132868 Jan  5 01:20 dash
-  -rwxr-xr-x 1 root root 133220 Sep 20  2022 date
-  -rwxr-xr-x 1 root root  67732 Sep 20  2022 dd
-  -rwxr-xr-x 1 root root  68104 Sep 20  2022 df
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 dir
-  -rwxr-xr-x 1 root root  59128 Mar 22 21:02 dmesg
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 dnsdomainname -> hostname
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 domainname -> hostname
-  -rwxr-xr-x 1 root root  67560 Sep 20  2022 echo
-  -rwxr-xr-x 1 root root     41 Jan 24 02:43 egrep
-  -rwxr-xr-x 1 root root  67548 Sep 20  2022 false
-  -rwxr-xr-x 1 root root     41 Jan 24 02:43 fgrep
-  -rwxr-xr-x 1 root root  55748 Mar 22 21:02 findmnt
-  -rwsr-xr-x 1 root root  26208 Mar 22 20:15 fusermount
-  -rwxr-xr-x 1 root root 128608 Jan 24 02:43 grep
-  -rwxr-xr-x 2 root root   2346 Apr  9  2022 gunzip
-  -rwxr-xr-x 1 root root   6447 Apr  9  2022 gzexe
-  -rwxr-xr-x 1 root root  64220 Apr  9  2022 gzip
-  -rwxr-xr-x 1 root root  67032 Dec 19 01:33 hostname
-  -rwxr-xr-x 1 root root  67720 Sep 20  2022 ln
-  -rwxr-xr-x 1 root root  35132 Mar 22 21:51 login
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 ls
-  -rwxr-xr-x 1 root root 136808 Mar 22 21:02 lsblk
-  -rwxr-xr-x 1 root root  67800 Sep 20  2022 mkdir
-  -rwxr-xr-x 1 root root  67764 Sep 20  2022 mknod
-  -rwxr-xr-x 1 root root  67596 Sep 20  2022 mktemp
-  -rwxr-xr-x 1 root root  38504 Mar 22 21:02 more
-  -rwsr-xr-x 1 root root  38496 Mar 22 21:02 mount
-  -rwxr-xr-x 1 root root   9824 Mar 22 21:02 mountpoint
-  -rwxr-xr-x 1 root root 133532 Sep 20  2022 mv
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 nisdomainname -> hostname
-  lrwxrwxrwx 1 root root     14 Apr  2 18:25 pidof -> /sbin/killall5
-  -rwxr-xr-x 1 root root  67608 Sep 20  2022 pwd
-  lrwxrwxrwx 1 root root      4 Apr 23 09:24 rbash -> bash
-  -rwxr-xr-x 1 root root  67600 Sep 20  2022 readlink
-  -rwxr-xr-x 1 root root  67672 Sep 20  2022 rm
-  -rwxr-xr-x 1 root root  67600 Sep 20  2022 rmdir
-  -rwxr-xr-x 1 root root  67400 Nov  2  2022 run-parts
-  -rwxr-xr-x 1 root root 133372 Jan  5 07:55 sed
-  lrwxrwxrwx 1 root root      4 Jan  5 01:20 sh -> dash
-  -rwxr-xr-x 1 root root  67584 Sep 20  2022 sleep
-  -rwxr-xr-x 1 root root  67644 Sep 20  2022 stty
-  -rwsr-xr-x 1 root root  50800 Mar 22 21:02 su
-  -rwxr-xr-x 1 root root  67584 Sep 20  2022 sync
-  -rwxr-xr-x 1 root root 336764 Apr  6 02:25 tar
-  -rwxr-xr-x 1 root root  67144 Nov  2  2022 tempfile
-  -rwxr-xr-x 1 root root 133224 Sep 20  2022 touch
-  -rwxr-xr-x 1 root root  67548 Sep 20  2022 true
-  -rwxr-xr-x 1 root root   9768 Mar 22 20:15 ulockmgr_server
-  -rwsr-xr-x 1 root root  22108 Mar 22 21:02 umount
-  -rwxr-xr-x 1 root root  67572 Sep 20  2022 uname
-  -rwxr-xr-x 2 root root   2346 Apr  9  2022 uncompress
-  -rwxr-xr-x 1 root root 133632 Sep 20  2022 vdir
-  -rwxr-xr-x 1 root root  42608 Mar 22 21:02 wdctl
-  lrwxrwxrwx 1 root root      8 Dec 19 01:33 ypdomainname -> hostname
-  -rwxr-xr-x 1 root root   1984 Apr  9  2022 zcat
-  -rwxr-xr-x 1 root root   1678 Apr  9  2022 zcmp
-  -rwxr-xr-x 1 root root   6460 Apr  9  2022 zdiff
-  -rwxr-xr-x 1 root root     29 Apr  9  2022 zegrep
-  -rwxr-xr-x 1 root root     29 Apr  9  2022 zfgrep
-  -rwxr-xr-x 1 root root   2081 Apr  9  2022 zforce
-  -rwxr-xr-x 1 root root   8103 Apr  9  2022 zgrep
-  -rwxr-xr-x 1 root root   2206 Apr  9  2022 zless
-  -rwxr-xr-x 1 root root   1842 Apr  9  2022 zmore
-  -rwxr-xr-x 1 root root   4577 Apr  9  2022 znew
-I: user script /srv/workspace/pbuilder/3656/tmp/hooks/D02_print_environment finished
+  -rwxr-xr-x 1 root root 838488 Apr 24 11:24 bash
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bunzip2
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bzcat
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzcmp -> bzdiff
+  -rwxr-xr-x 1 root root   2225 Sep 19  2022 bzdiff
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzegrep -> bzgrep
+  -rwxr-xr-x 1 root root   4893 Nov 28  2021 bzexe
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzfgrep -> bzgrep
+  -rwxr-xr-x 1 root root   3775 Sep 19  2022 bzgrep
+  -rwxr-xr-x 3 root root  67144 Sep 19  2022 bzip2
+  -rwxr-xr-x 1 root root  67112 Sep 19  2022 bzip2recover
+  lrwxrwxrwx 1 root root      6 Sep 19  2022 bzless -> bzmore
+  -rwxr-xr-x 1 root root   1297 Sep 19  2022 bzmore
+  -rwxr-xr-x 1 root root  67632 Sep 21  2022 cat
+  -rwxr-xr-x 1 root root  67676 Sep 21  2022 chgrp
+  -rwxr-xr-x 1 root root  67644 Sep 21  2022 chmod
+  -rwxr-xr-x 1 root root  67684 Sep 21  2022 chown
+  -rwxr-xr-x 1 root root 133532 Sep 21  2022 cp
+  -rwxr-xr-x 1 root root 132868 Jan  6 03:20 dash
+  -rwxr-xr-x 1 root root 133220 Sep 21  2022 date
+  -rwxr-xr-x 1 root root  67732 Sep 21  2022 dd
+  -rwxr-xr-x 1 root root  68104 Sep 21  2022 df
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 dir
+  -rwxr-xr-x 1 root root  59128 Mar 23 23:02 dmesg
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 dnsdomainname -> hostname
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 domainname -> hostname
+  -rwxr-xr-x 1 root root  67560 Sep 21  2022 echo
+  -rwxr-xr-x 1 root root     41 Jan 25 04:43 egrep
+  -rwxr-xr-x 1 root root  67548 Sep 21  2022 false
+  -rwxr-xr-x 1 root root     41 Jan 25 04:43 fgrep
+  -rwxr-xr-x 1 root root  55748 Mar 23 23:02 findmnt
+  -rwsr-xr-x 1 root root  26208 Mar 23 22:15 fusermount
+  -rwxr-xr-x 1 root root 128608 Jan 25 04:43 grep
+  -rwxr-xr-x 2 root root   2346 Apr 10  2022 gunzip
+  -rwxr-xr-x 1 root root   6447 Apr 10  2022 gzexe
+  -rwxr-xr-x 1 root root  64220 Apr 10  2022 gzip
+  -rwxr-xr-x 1 root root  67032 Dec 20 03:33 hostname
+  -rwxr-xr-x 1 root root  67720 Sep 21  2022 ln
+  -rwxr-xr-x 1 root root  35132 Mar 23 23:51 login
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 ls
+  -rwxr-xr-x 1 root root 136808 Mar 23 23:02 lsblk
+  -rwxr-xr-x 1 root root  67800 Sep 21  2022 mkdir
+  -rwxr-xr-x 1 root root  67764 Sep 21  2022 mknod
+  -rwxr-xr-x 1 root root  67596 Sep 21  2022 mktemp
+  -rwxr-xr-x 1 root root  38504 Mar 23 23:02 more
+  -rwsr-xr-x 1 root root  38496 Mar 23 23:02 mount
+  -rwxr-xr-x 1 root root   9824 Mar 23 23:02 mountpoint
+  -rwxr-xr-x 1 root root 133532 Sep 21  2022 mv
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 nisdomainname -> hostname
+  lrwxrwxrwx 1 root root     14 Apr  3 20:25 pidof -> /sbin/killall5
+  -rwxr-xr-x 1 root root  67608 Sep 21  2022 pwd
+  lrwxrwxrwx 1 root root      4 Apr 24 11:24 rbash -> bash
+  -rwxr-xr-x 1 root root  67600 Sep 21  2022 readlink
+  -rwxr-xr-x 1 root root  67672 Sep 21  2022 rm
+  -rwxr-xr-x 1 root root  67600 Sep 21  2022 rmdir
+  -rwxr-xr-x 1 root root  67400 Nov  3  2022 run-parts
+  -rwxr-xr-x 1 root root 133372 Jan  6 09:55 sed
+  lrwxrwxrwx 1 root root      9 May 27 11:21 sh -> /bin/bash
+  -rwxr-xr-x 1 root root  67584 Sep 21  2022 sleep
+  -rwxr-xr-x 1 root root  67644 Sep 21  2022 stty
+  -rwsr-xr-x 1 root root  50800 Mar 23 23:02 su
+  -rwxr-xr-x 1 root root  67584 Sep 21  2022 sync
+  -rwxr-xr-x 1 root root 336764 Apr  7 04:25 tar
+  -rwxr-xr-x 1 root root  67144 Nov  3  2022 tempfile
+  -rwxr-xr-x 1 root root 133224 Sep 21  2022 touch
+  -rwxr-xr-x 1 root root  67548 Sep 21  2022 true
+  -rwxr-xr-x 1 root root   9768 Mar 23 22:15 ulockmgr_server
+  -rwsr-xr-x 1 root root  22108 Mar 23 23:02 umount
+  -rwxr-xr-x 1 root root  67572 Sep 21  2022 uname
+  -rwxr-xr-x 2 root root   2346 Apr 10  2022 uncompress
+  -rwxr-xr-x 1 root root 133632 Sep 21  2022 vdir
+  -rwxr-xr-x 1 root root  42608 Mar 23 23:02 wdctl
+  lrwxrwxrwx 1 root root      8 Dec 20 03:33 ypdomainname -> hostname
+  -rwxr-xr-x 1 root root   1984 Apr 10  2022 zcat
+  -rwxr-xr-x 1 root root   1678 Apr 10  2022 zcmp
+  -rwxr-xr-x 1 root root   6460 Apr 10  2022 zdiff
+  -rwxr-xr-x 1 root root     29 Apr 10  2022 zegrep
+  -rwxr-xr-x 1 root root     29 Apr 10  2022 zfgrep
+  -rwxr-xr-x 1 root root   2081 Apr 10  2022 zforce
+  -rwxr-xr-x 1 root root   8103 Apr 10  2022 zgrep
+  -rwxr-xr-x 1 root root   2206 Apr 10  2022 zless
+  -rwxr-xr-x 1 root root   1842 Apr 10  2022 zmore
+  -rwxr-xr-x 1 root root   4577 Apr 10  2022 znew
+I: user script /srv/workspace/pbuilder/17943/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -304,7 +336,7 @@
 Get: 94 http://deb.debian.org/debian bookworm/main armhf llvm-14-tools armhf 1:14.0.6-12 [361 kB]
 Get: 95 http://deb.debian.org/debian bookworm/main armhf llvm-14-dev armhf 1:14.0.6-12 [33.7 MB]
 Get: 96 http://deb.debian.org/debian bookworm/main armhf zlib1g-dev armhf 1:1.2.13.dfsg-1 [902 kB]
-Fetched 159 MB in 17s (9091 kB/s)
+Fetched 159 MB in 9s (17.1 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package liblocale-gettext-perl.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19326 files and directories currently installed.)
@@ -707,10 +739,17 @@
 Reading package lists...
 Building dependency tree...
 Reading state information...
+usrmerge is already the newest version (35).
 fakeroot is already the newest version (1.31-1.2).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/iwyu-8.18/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../iwyu_8.18-2_source.changes
+I: user script /srv/workspace/pbuilder/17943/tmp/hooks/A99_set_merged_usr starting
+Re-configuring usrmerge...
+removed '/etc/unsupported-skip-usrmerge-conversion'
+The system has been successfully converted.
+I: user script /srv/workspace/pbuilder/17943/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/iwyu-8.18/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../iwyu_8.18-2_source.changes
 dpkg-buildpackage: info: source package iwyu
 dpkg-buildpackage: info: source version 8.18-2
 dpkg-buildpackage: info: source distribution unstable
@@ -840,7 +879,7 @@
    debian/rules override_dh_auto_build
 make[1]: Entering directory '/build/iwyu-8.18'
 dh_auto_build
-	cd iwyu-build && make -j3 "INSTALL=install --strip-program=true" VERBOSE=1
+	cd iwyu-build && make -j4 "INSTALL=install --strip-program=true" VERBOSE=1
 make[2]: Entering directory '/build/iwyu-8.18/iwyu-build'
 /usr/bin/cmake -S/build/iwyu-8.18 -B/build/iwyu-8.18/iwyu-build --check-build-system CMakeFiles/Makefile.cmake 0
 /usr/bin/cmake -E cmake_progress_start /build/iwyu-8.18/iwyu-build/CMakeFiles /build/iwyu-8.18/iwyu-build//CMakeFiles/progress.marks
@@ -856,29 +895,29 @@
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_builtin_vars.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_builtin_vars.h
 [  1%] Copying clang's __clang_cuda_cmath.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_cmath.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_cmath.h
-[  1%] Copying clang's __clang_cuda_complex_builtins.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_complex_builtins.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_complex_builtins.h
 [  2%] Copying clang's __clang_cuda_device_functions.h...
+[  2%] Copying clang's __clang_cuda_complex_builtins.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_complex_builtins.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_complex_builtins.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_device_functions.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_device_functions.h
 [  2%] Copying clang's __clang_cuda_intrinsics.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_intrinsics.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_intrinsics.h
+[  2%] Copying clang's __clang_cuda_math.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_math.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_math.h
 [  3%] Copying clang's __clang_cuda_libdevice_declares.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_libdevice_declares.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_libdevice_declares.h
-[  3%] Copying clang's __clang_cuda_math.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_math.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_math.h
-[  4%] Copying clang's __clang_cuda_math_forward_declares.h...
+[  4%] Copying clang's __clang_cuda_texture_intrinsics.h...
+[  5%] Copying clang's __clang_cuda_math_forward_declares.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_texture_intrinsics.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_texture_intrinsics.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_math_forward_declares.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_math_forward_declares.h
-[  4%] Copying clang's __clang_cuda_runtime_wrapper.h...
+[  5%] Copying clang's __clang_cuda_runtime_wrapper.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_runtime_wrapper.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_runtime_wrapper.h
-[  5%] Copying clang's __clang_cuda_texture_intrinsics.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_cuda_texture_intrinsics.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_cuda_texture_intrinsics.h
 [  5%] Copying clang's __clang_hip_cmath.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_hip_cmath.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_hip_cmath.h
 [  6%] Copying clang's __clang_hip_libdevice_declares.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_hip_libdevice_declares.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_hip_libdevice_declares.h
 [  6%] Copying clang's __clang_hip_math.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_hip_math.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_hip_math.h
 [  7%] Copying clang's __clang_hip_runtime_wrapper.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_hip_math.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_hip_math.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__clang_hip_runtime_wrapper.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__clang_hip_runtime_wrapper.h
 [  7%] Copying clang's __stddef_max_align_t.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/__stddef_max_align_t.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/__stddef_max_align_t.h
@@ -892,18 +931,18 @@
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/altivec.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/altivec.h
 [ 10%] Copying clang's ammintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ammintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ammintrin.h
-[ 11%] Copying clang's amxintrin.h...
+[ 11%] Copying clang's arm_acle.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm_acle.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm_acle.h
+[ 12%] Copying clang's amxintrin.h...
+[ 12%] Copying clang's arm64intr.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/amxintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/amxintrin.h
-[ 11%] Copying clang's arm64intr.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm64intr.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm64intr.h
-[ 12%] Copying clang's arm_acle.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm_acle.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm_acle.h
 [ 12%] Copying clang's arm_bf16.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm_bf16.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm_bf16.h
-[ 12%] Copying clang's arm_cmse.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm_cmse.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm_cmse.h
 [ 13%] Copying clang's arm_cde.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm_cde.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm_cde.h
+[ 13%] Copying clang's arm_cmse.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm_cmse.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm_cmse.h
 [ 14%] Copying clang's arm_fp16.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm_fp16.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm_fp16.h
 [ 14%] Copying clang's arm_mve.h...
@@ -914,22 +953,22 @@
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/arm_sve.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/arm_sve.h
 [ 16%] Copying clang's armintr.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/armintr.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/armintr.h
-[ 16%] Copying clang's avx512bf16intrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512bf16intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512bf16intrin.h
 [ 17%] Copying clang's avx2intrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx2intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx2intrin.h
+[ 17%] Copying clang's avx512bf16intrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512bf16intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512bf16intrin.h
 [ 18%] Copying clang's avx512bitalgintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512bitalgintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512bitalgintrin.h
 [ 18%] Copying clang's avx512bwintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512bwintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512bwintrin.h
+[ 18%] Copying clang's avx512dqintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512dqintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512dqintrin.h
 [ 19%] Copying clang's avx512cdintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512cdintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512cdintrin.h
-[ 19%] Copying clang's avx512dqintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512dqintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512dqintrin.h
-[ 20%] Copying clang's avx512fintrin.h...
 [ 20%] Copying clang's avx512erintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512fintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512fintrin.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512erintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512erintrin.h
+[ 20%] Copying clang's avx512fintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512fintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512fintrin.h
 [ 21%] Copying clang's avx512fp16intrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512fp16intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512fp16intrin.h
 [ 21%] Copying clang's avx512ifmaintrin.h...
@@ -960,11 +999,11 @@
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512vlintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512vlintrin.h
 [ 28%] Copying clang's avx512vlvbmi2intrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512vlvbmi2intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512vlvbmi2intrin.h
+[ 29%] Copying clang's avx512vlvp2intersectintrin.h...
 [ 29%] Copying clang's avx512vlvnniintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512vlvnniintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512vlvnniintrin.h
-[ 29%] Copying clang's avx512vlvp2intersectintrin.h...
-[ 30%] Copying clang's avx512vnniintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512vlvp2intersectintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512vlvp2intersectintrin.h
+[ 30%] Copying clang's avx512vnniintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512vnniintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512vnniintrin.h
 [ 30%] Copying clang's avx512vp2intersectintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/avx512vp2intersectintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/avx512vp2intersectintrin.h
@@ -980,10 +1019,10 @@
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/bmi2intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/bmi2intrin.h
 [ 34%] Copying clang's bmiintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/bmiintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/bmiintrin.h
+[ 34%] Copying clang's builtins.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/builtins.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/builtins.h
 [ 35%] Copying clang's cet.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/cet.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/cet.h
-[ 35%] Copying clang's builtins.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/builtins.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/builtins.h
 [ 35%] Copying clang's cetintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/cetintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/cetintrin.h
 [ 36%] Copying clang's cldemoteintrin.h...
@@ -992,65 +1031,65 @@
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/clflushoptintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/clflushoptintrin.h
 [ 37%] Copying clang's clwbintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/clwbintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/clwbintrin.h
+[ 37%] Copying clang's clzerointrin.h...
 [ 38%] Copying clang's cpuid.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/cpuid.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/cpuid.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/clzerointrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/clzerointrin.h
 [ 38%] Copying clang's crc32intrin.h...
-[ 38%] Copying clang's clzerointrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/cpuid.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/cpuid.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/crc32intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/crc32intrin.h
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/clzerointrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/clzerointrin.h
-[ 39%] Copying clang's cuda_wrappers/new...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/cuda_wrappers/new /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/cuda_wrappers/new
-[ 40%] Copying clang's cuda_wrappers/algorithm...
+[ 39%] Copying clang's cuda_wrappers/algorithm...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/cuda_wrappers/algorithm /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/cuda_wrappers/algorithm
-[ 40%] Copying clang's cuda_wrappers/complex...
+[ 39%] Copying clang's cuda_wrappers/complex...
+[ 40%] Copying clang's cuda_wrappers/new...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/cuda_wrappers/complex /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/cuda_wrappers/complex
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/cuda_wrappers/new /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/cuda_wrappers/new
 [ 40%] Copying clang's emmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/emmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/emmintrin.h
 [ 41%] Copying clang's f16cintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/f16cintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/f16cintrin.h
 [ 42%] Copying clang's enqcmdintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/enqcmdintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/enqcmdintrin.h
+[ 42%] Copying clang's float.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/float.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/float.h
 [ 43%] Copying clang's fma4intrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/fma4intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/fma4intrin.h
-[ 43%] Copying clang's float.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/float.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/float.h
 [ 43%] Copying clang's fmaintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/fmaintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/fmaintrin.h
-[ 43%] Copying clang's gfniintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/gfniintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/gfniintrin.h
 [ 44%] Copying clang's fxsrintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/fxsrintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/fxsrintrin.h
+[ 44%] Copying clang's gfniintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/gfniintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/gfniintrin.h
 [ 45%] Copying clang's hexagon_circ_brev_intrinsics.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/hexagon_circ_brev_intrinsics.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/hexagon_circ_brev_intrinsics.h
 [ 45%] Copying clang's hexagon_protos.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/hexagon_protos.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/hexagon_protos.h
 [ 46%] Copying clang's hexagon_types.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/hexagon_types.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/hexagon_types.h
+[ 46%] Copying clang's htmxlintrin.h...
 [ 46%] Copying clang's hresetintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/hresetintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/hresetintrin.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/htmxlintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/htmxlintrin.h
 [ 47%] Copying clang's htmintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/hresetintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/hresetintrin.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/htmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/htmintrin.h
-[ 47%] Copying clang's htmxlintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/htmxlintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/htmxlintrin.h
 [ 47%] Copying clang's ia32intrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ia32intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ia32intrin.h
 [ 48%] Copying clang's hvx_hexagon_protos.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ia32intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ia32intrin.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/hvx_hexagon_protos.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/hvx_hexagon_protos.h
-[ 50%] Copying clang's intrin.h...
 [ 49%] Copying clang's immintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/intrin.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/immintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/immintrin.h
+[ 50%] Copying clang's intrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/intrin.h
 [ 50%] Copying clang's inttypes.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/inttypes.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/inttypes.h
+[ 50%] Copying clang's iso646.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/iso646.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/iso646.h
 [ 51%] Copying clang's invpcidintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/invpcidintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/invpcidintrin.h
-[ 51%] Copying clang's iso646.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/iso646.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/iso646.h
 [ 52%] Copying clang's keylockerintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/keylockerintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/keylockerintrin.h
 [ 52%] Copying clang's limits.h...
-[ 53%] Copying clang's lwpintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/limits.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/limits.h
+[ 53%] Copying clang's lwpintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/lwpintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/lwpintrin.h
 [ 53%] Copying clang's lzcntintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/lzcntintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/lzcntintrin.h
@@ -1062,16 +1101,16 @@
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/mmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/mmintrin.h
 [ 55%] Copying clang's module.modulemap...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/module.modulemap /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/module.modulemap
+[ 55%] Copying clang's msa.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/msa.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/msa.h
 [ 56%] Copying clang's movdirintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/movdirintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/movdirintrin.h
-[ 56%] Copying clang's msa.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/msa.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/msa.h
 [ 57%] Copying clang's mwaitxintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/mwaitxintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/mwaitxintrin.h
 [ 58%] Copying clang's opencl-c-base.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/opencl-c-base.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/opencl-c-base.h
-[ 57%] Copying clang's nmmintrin.h...
+[ 58%] Copying clang's nmmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/nmmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/nmmintrin.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/opencl-c-base.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/opencl-c-base.h
 [ 59%] Copying clang's opencl-c.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/opencl-c.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/opencl-c.h
 [ 59%] Copying clang's openmp_wrappers/__clang_openmp_device_functions.h...
@@ -1080,68 +1119,68 @@
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/openmp_wrappers/cmath /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/openmp_wrappers/cmath
 [ 60%] Copying clang's openmp_wrappers/complex...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/openmp_wrappers/complex /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/openmp_wrappers/complex
+[ 60%] Copying clang's openmp_wrappers/complex_cmath.h...
 [ 61%] Copying clang's openmp_wrappers/complex.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/openmp_wrappers/complex.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/openmp_wrappers/complex.h
-[ 61%] Copying clang's openmp_wrappers/complex_cmath.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/openmp_wrappers/complex_cmath.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/openmp_wrappers/complex_cmath.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/openmp_wrappers/complex.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/openmp_wrappers/complex.h
 [ 62%] Copying clang's openmp_wrappers/math.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/openmp_wrappers/math.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/openmp_wrappers/math.h
 [ 62%] Copying clang's openmp_wrappers/new...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/openmp_wrappers/new /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/openmp_wrappers/new
 [ 63%] Copying clang's pconfigintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/pconfigintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/pconfigintrin.h
 [ 63%] Copying clang's pkuintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/pkuintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/pkuintrin.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/pconfigintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/pconfigintrin.h
 [ 64%] Copying clang's pmmintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/pkuintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/pkuintrin.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/pmmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/pmmintrin.h
 [ 64%] Copying clang's popcntintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/popcntintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/popcntintrin.h
 [ 65%] Copying clang's ppc_wrappers/emmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ppc_wrappers/emmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ppc_wrappers/emmintrin.h
 [ 65%] Copying clang's ppc_wrappers/mm_malloc.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ppc_wrappers/mm_malloc.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ppc_wrappers/mm_malloc.h
 [ 66%] Copying clang's ppc_wrappers/mmintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ppc_wrappers/mm_malloc.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ppc_wrappers/mm_malloc.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ppc_wrappers/mmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ppc_wrappers/mmintrin.h
 [ 67%] Copying clang's ppc_wrappers/pmmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ppc_wrappers/pmmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ppc_wrappers/pmmintrin.h
 [ 67%] Copying clang's ppc_wrappers/smmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ppc_wrappers/smmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ppc_wrappers/smmintrin.h
 [ 68%] Copying clang's ppc_wrappers/tmmintrin.h...
+[ 67%] Copying clang's ppc_wrappers/xmmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ppc_wrappers/tmmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ppc_wrappers/tmmintrin.h
-[ 68%] Copying clang's ppc_wrappers/xmmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ppc_wrappers/xmmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ppc_wrappers/xmmintrin.h
 [ 69%] Copying clang's prfchwintrin.h...
-[ 69%] Copying clang's profile/InstrProfData.inc...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/prfchwintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/prfchwintrin.h
+[ 69%] Copying clang's profile/InstrProfData.inc...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/profile/InstrProfData.inc /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/profile/InstrProfData.inc
 [ 70%] Copying clang's ptwriteintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/ptwriteintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/ptwriteintrin.h
-[ 70%] Copying clang's rdseedintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/rdseedintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/rdseedintrin.h
 [ 71%] Copying clang's riscv_vector.h...
+[ 71%] Copying clang's rdseedintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/riscv_vector.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/riscv_vector.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/rdseedintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/rdseedintrin.h
 [ 71%] Copying clang's rtmintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/rtmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/rtmintrin.h
 [ 72%] Copying clang's s390intrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/s390intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/s390intrin.h
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/rtmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/rtmintrin.h
+[ 72%] Copying clang's serializeintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/serializeintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/serializeintrin.h
 [ 72%] Copying clang's shaintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/shaintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/shaintrin.h
-[ 72%] Copying clang's serializeintrin.h...
 [ 73%] Copying clang's sgxintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/serializeintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/serializeintrin.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/sgxintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/sgxintrin.h
-[ 73%] Copying clang's stdarg.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/stdarg.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/stdarg.h
 [ 74%] Copying clang's smmintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/smmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/smmintrin.h
 [ 75%] Copying clang's stdalign.h...
+[ 75%] Copying clang's stdarg.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/smmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/smmintrin.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/stdalign.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/stdalign.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/stdarg.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/stdarg.h
 [ 76%] Copying clang's stdatomic.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/stdatomic.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/stdatomic.h
-[ 76%] Copying clang's stdbool.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/stdbool.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/stdbool.h
 [ 77%] Copying clang's stddef.h...
+[ 77%] Copying clang's stdbool.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/stddef.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/stddef.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/stdbool.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/stdbool.h
 [ 77%] Copying clang's stdint.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/stdint.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/stdint.h
 [ 78%] Copying clang's stdnoreturn.h...
@@ -1149,10 +1188,10 @@
 [ 78%] Copying clang's tbmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/tbmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/tbmintrin.h
 [ 79%] Copying clang's tgmath.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/tgmath.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/tgmath.h
 [ 79%] Copying clang's tmmintrin.h...
-[ 80%] Copying clang's tsxldtrkintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/tgmath.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/tgmath.h
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/tmmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/tmmintrin.h
+[ 80%] Copying clang's tsxldtrkintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/tsxldtrkintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/tsxldtrkintrin.h
 [ 80%] Copying clang's uintrintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/uintrintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/uintrintrin.h
@@ -1167,35 +1206,35 @@
 [ 83%] Copying clang's vecintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/vecintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/vecintrin.h
 [ 84%] Copying clang's vpclmulqdqintrin.h...
+[ 84%] Copying clang's waitpkgintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/vpclmulqdqintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/vpclmulqdqintrin.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/waitpkgintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/waitpkgintrin.h
 [ 85%] Copying clang's wasm_simd128.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/wasm_simd128.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/wasm_simd128.h
-[ 85%] Copying clang's waitpkgintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/waitpkgintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/waitpkgintrin.h
 [ 85%] Copying clang's wbnoinvdintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/wbnoinvdintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/wbnoinvdintrin.h
 [ 86%] Copying clang's wmmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/wmmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/wmmintrin.h
 [ 86%] Copying clang's x86gprintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/x86gprintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/x86gprintrin.h
 [ 87%] Copying clang's x86intrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/x86intrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/x86intrin.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/x86gprintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/x86gprintrin.h
 [ 87%] Copying clang's xmmintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xmmintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xmmintrin.h
+[ 87%] Copying clang's xray/xray_interface.h...
 [ 88%] Copying clang's xopintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xopintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xopintrin.h
-[ 88%] Copying clang's xray/xray_interface.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xray/xray_interface.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xray/xray_interface.h
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xopintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xopintrin.h
 [ 89%] Copying clang's xray/xray_log_interface.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xray/xray_log_interface.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xray/xray_log_interface.h
 [ 89%] Copying clang's xray/xray_records.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xray/xray_records.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xray/xray_records.h
-[ 90%] Copying clang's xsavecintrin.h...
-/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xsavecintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xsavecintrin.h
 [ 90%] Copying clang's xsaveintrin.h...
+[ 90%] Copying clang's xsaveoptintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xsaveintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xsaveintrin.h
-[ 91%] Copying clang's xsaveoptintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xsaveoptintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xsaveoptintrin.h
+[ 91%] Copying clang's xsavecintrin.h...
+/usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xsavecintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xsavecintrin.h
 [ 92%] Copying clang's xsavesintrin.h...
 /usr/bin/cmake -E copy_if_different /usr/lib/llvm-14/lib/clang/14.0.6/include/xsavesintrin.h /build/iwyu-8.18/iwyu-build/lib/clang/14.0.6/include/xsavesintrin.h
 [ 92%] Copying clang's xtestintrin.h...
@@ -1209,29 +1248,37 @@
 make  -f CMakeFiles/include-what-you-use.dir/build.make CMakeFiles/include-what-you-use.dir/build
 make[4]: Entering directory '/build/iwyu-8.18/iwyu-build'
 [ 93%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu.cc.o
+[ 93%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_ast_util.cc.o
 /usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu.cc.o -c /build/iwyu-8.18/iwyu.cc
-[ 94%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o
-/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o -c /build/iwyu-8.18/iwyu_cache.cc
-[ 94%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_ast_util.cc.o
+[ 93%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_driver.cc.o
 /usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_ast_util.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_ast_util.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_ast_util.cc.o -c /build/iwyu-8.18/iwyu_ast_util.cc
-[ 94%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_driver.cc.o
+[ 94%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o
 /usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_driver.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_driver.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_driver.cc.o -c /build/iwyu-8.18/iwyu_driver.cc
+/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o -c /build/iwyu-8.18/iwyu_cache.cc
 [ 95%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_getopt.cc.o
 /usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_getopt.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_getopt.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_getopt.cc.o -c /build/iwyu-8.18/iwyu_getopt.cc
 [ 95%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_globals.cc.o
 /usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_globals.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_globals.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_globals.cc.o -c /build/iwyu-8.18/iwyu_globals.cc
 [ 96%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_include_picker.cc.o
 /usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_include_picker.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_include_picker.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_include_picker.cc.o -c /build/iwyu-8.18/iwyu_include_picker.cc
+[ 96%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o
+/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o -c /build/iwyu-8.18/iwyu_lexer_utils.cc
+[ 97%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o
+/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o -c /build/iwyu-8.18/iwyu_location_util.cc
+[ 97%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o
+/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o -c /build/iwyu-8.18/iwyu_output.cc
+[ 98%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o
+/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o -c /build/iwyu-8.18/iwyu_path_util.cc
+[ 98%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o
+/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o -c /build/iwyu-8.18/iwyu_preprocessor.cc
 /build/iwyu-8.18/iwyu_ast_util.cc: In function 'std::string include_what_you_use::PrintableTemplateArgumentLoc(const clang::TemplateArgumentLoc&)':
 /build/iwyu-8.18/iwyu_ast_util.cc:500:28: note: parameter passing for argument of type 'llvm::ArrayRef<clang::TemplateArgumentLoc>' changed in GCC 7.1
   500 |   printTemplateArgumentList(ostream, ArrayRef<TemplateArgumentLoc>(arg),
       |   ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   501 |                             DefaultPrintPolicy());
       |                             ~~~~~~~~~~~~~~~~~~~~~
-[ 96%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o
-/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o -c /build/iwyu-8.18/iwyu_lexer_utils.cc
-[ 97%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o
-/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o -c /build/iwyu-8.18/iwyu_location_util.cc
+[ 99%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o
+/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o -c /build/iwyu-8.18/iwyu_verrs.cc
 In file included from /usr/include/c++/12/vector:70,
                  from /build/iwyu-8.18/iwyu.cc:102:
 /usr/include/c++/12/bits/vector.tcc: In member function 'void std::vector<_Tp, _Alloc>::_M_realloc_insert(iterator, _Args&& ...) [with _Args = {const clang::TemplateArgument&}; _Tp = clang::TemplateArgument; _Alloc = std::allocator<clang::TemplateArgument>]':
@@ -1240,10 +1287,6 @@
       |       ^~~~~~~~~~~~~~~~~~~
 /usr/include/c++/12/bits/vector.tcc: In member function 'void std::vector<_Tp, _Alloc>::_M_realloc_insert(iterator, _Args&& ...) [with _Args = {const clang::TemplateArgumentLoc&}; _Tp = clang::TemplateArgumentLoc; _Alloc = std::allocator<clang::TemplateArgumentLoc>]':
 /usr/include/c++/12/bits/vector.tcc:439:7: note: parameter passing for argument of type 'std::vector<clang::TemplateArgumentLoc, std::allocator<clang::TemplateArgumentLoc> >::iterator' changed in GCC 7.1
-[ 97%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o
-/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o -c /build/iwyu-8.18/iwyu_output.cc
-[ 98%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o
-/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o -c /build/iwyu-8.18/iwyu_path_util.cc
 In file included from /usr/include/c++/12/vector:64:
 In member function 'void std::vector<_Tp, _Alloc>::push_back(const value_type&) [with _Tp = clang::TemplateArgument; _Alloc = std::allocator<clang::TemplateArgument>]',
     inlined from 'void include_what_you_use::AstFlattenerVisitor::NodeSet::Add(clang::TemplateArgument)' at /build/iwyu-8.18/iwyu.cc:890:55,
@@ -1277,10 +1320,6 @@
 /usr/include/c++/12/bits/stl_vector.h:1287:28: note: parameter passing for argument of type '__gnu_cxx::__normal_iterator<clang::TemplateArgumentLoc*, std::vector<clang::TemplateArgumentLoc, std::allocator<clang::TemplateArgumentLoc> > >' changed in GCC 7.1
  1287 |           _M_realloc_insert(end(), __x);
       |           ~~~~~~~~~~~~~~~~~^~~~~~~~~~~~
-[ 98%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o
-/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o -c /build/iwyu-8.18/iwyu_preprocessor.cc
-[ 99%] Building CXX object CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o
-/usr/bin/c++ -DIWYU_GIT_REV=\"\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/usr/lib/llvm-14/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS  -fno-exceptions -std=c++14 -MD -MT CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o -MF CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o.d -o CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o -c /build/iwyu-8.18/iwyu_verrs.cc
 [100%] Linking CXX executable bin/include-what-you-use
 /usr/bin/cmake -E cmake_link_script CMakeFiles/include-what-you-use.dir/link.txt --verbose=1
 /usr/bin/c++  -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror=date-time -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wno-missing-field-initializers -Wimplicit-fallthrough -Wno-class-memaccess -Wno-redundant-move -Wno-pessimizing-move -Wno-noexcept-type -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wmisleading-indentation -ffunction-sections -fdata-sections -O3 -DNDEBUG -Wl,-z,relro  -Wl,-rpath-link,  -Wl,--gc-sections "CMakeFiles/include-what-you-use.dir/iwyu.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_ast_util.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_cache.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_driver.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_getopt.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_globals.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_include_picker.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_lexer_utils.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_location_util.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_output.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_path_util.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_preprocessor.cc.o" "CMakeFiles/include-what-you-use.dir/iwyu_verrs.cc.o" -o bin/include-what-you-use  -Wl,-rpath,"\$ORIGIN/../lib:/usr/lib/llvm-14/lib" /usr/lib/llvm-14/lib/libclang-cpp.so.14 /usr/lib/llvm-14/lib/libLLVM-14.so.1 
@@ -1297,10 +1336,10 @@
    debian/rules override_dh_auto_test
 make[1]: Entering directory '/build/iwyu-8.18'
 dh_auto_test || true
-	cd iwyu-build && make -j3 test ARGS\+=--verbose ARGS\+=-j3
+	cd iwyu-build && make -j4 test ARGS\+=--verbose ARGS\+=-j4
 make[2]: Entering directory '/build/iwyu-8.18/iwyu-build'
 Running tests...
-/usr/bin/ctest --force-new-ctest-process --verbose -j3
+/usr/bin/ctest --force-new-ctest-process --verbose -j4
 UpdateCTestConfiguration  from :/build/iwyu-8.18/iwyu-build/DartConfiguration.tcl
 UpdateCTestConfiguration  from :/build/iwyu-8.18/iwyu-build/DartConfiguration.tcl
 Test project /build/iwyu-8.18/iwyu-build
@@ -1328,61 +1367,27 @@
 3: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/c/libbuiltins.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 3: Working Directory: /build/iwyu-8.18
 3: Test timeout computed to be: 10000000
-1: INFO:root:Testing iwyu on tests/c/elaborated_struct.c
-3: INFO:root:Testing iwyu on tests/c/libbuiltins.c
-2: INFO:root:Testing iwyu on tests/c/keep_includes.c
-2: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --keep=tests/c/keep_includes*.h -I .  tests/c/keep_includes.c
-2: 
-2: (tests/c/keep_includes.c has correct #includes/fwd-decls)
-2: 
-  1/158 Test   #2: c.test_keep_includes ..............................   Passed    1.28 sec
 test 4
         Start   4: cxx.test_alias_template
 
 4: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/alias_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 4: Working Directory: /build/iwyu-8.18
 4: Test timeout computed to be: 10000000
-1: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/c/elaborated_struct.c
-1: 
-1: tests/c/elaborated_struct.c should add these lines:
-1: struct Struct;
-1: 
-1: tests/c/elaborated_struct.c should remove these lines:
-1: - #include "tests/c/elaborated_struct-d1.h"  // lines 12-12
-1: 
-1: The full include-list for tests/c/elaborated_struct.c:
-1: struct ForwardDeclared;  // lines 28-28
-1: struct Struct;
-1: ---
-1: 
-  2/158 Test   #1: c.test_elaborated_struct ..........................   Passed    1.62 sec
+2: INFO:root:Testing iwyu on tests/c/keep_includes.c
+3: INFO:root:Testing iwyu on tests/c/libbuiltins.c
+4: INFO:root:Testing iwyu on tests/cxx/alias_template.cc
+1: INFO:root:Testing iwyu on tests/c/elaborated_struct.c
+2: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --keep=tests/c/keep_includes*.h -I .  tests/c/keep_includes.c
+2: 
+2: (tests/c/keep_includes.c has correct #includes/fwd-decls)
+2: 
+  1/158 Test   #2: c.test_keep_includes ..............................   Passed    0.31 sec
 test 5
         Start   5: cxx.test_alias_template_use
 
 5: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/alias_template_use.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 5: Working Directory: /build/iwyu-8.18
 5: Test timeout computed to be: 10000000
-4: INFO:root:Testing iwyu on tests/cxx/alias_template.cc
-3: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/c/libbuiltins.c
-3: tests/c/libbuiltins.c:20:10: warning: pow is defined in <math.h>, which isn't directly #included.
-3: 
-3: tests/c/libbuiltins.c should add these lines:
-3: #include <math.h>  // for pow
-3: 
-3: tests/c/libbuiltins.c should remove these lines:
-3: - #include "tests/c/libbuiltins-direct.h"  // lines 16-16
-3: 
-3: The full include-list for tests/c/libbuiltins.c:
-3: #include <math.h>  // for pow
-3: ---
-3: 
-  3/158 Test   #3: c.test_libbuiltins ................................   Passed    2.02 sec
-test 6
-        Start   6: cxx.test_anonymous_struct
-
-6: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/anonymous_struct.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-6: Working Directory: /build/iwyu-8.18
-6: Test timeout computed to be: 10000000
 4: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11 -I .  tests/cxx/alias_template.cc
 4: tests/cxx/alias_template.cc:25:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 4: tests/cxx/alias_template.cc:25:22: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -1407,15 +1412,57 @@
 4: #include "tests/cxx/indirect.h"  // for IndirectClass
 4: ---
 4: 
-5: INFO:root:Testing iwyu on tests/cxx/alias_template_use.cc
-  4/158 Test   #4: cxx.test_alias_template ...........................   Passed    0.88 sec
+1: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/c/elaborated_struct.c
+1: 
+1: tests/c/elaborated_struct.c should add these lines:
+1: struct Struct;
+1: 
+1: tests/c/elaborated_struct.c should remove these lines:
+1: - #include "tests/c/elaborated_struct-d1.h"  // lines 12-12
+1: 
+1: The full include-list for tests/c/elaborated_struct.c:
+1: struct ForwardDeclared;  // lines 28-28
+1: struct Struct;
+1: ---
+1: 
+  2/158 Test   #4: cxx.test_alias_template ...........................   Passed    0.35 sec
+test 6
+        Start   6: cxx.test_anonymous_struct
+
+6: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/anonymous_struct.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+6: Working Directory: /build/iwyu-8.18
+6: Test timeout computed to be: 10000000
+3: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/c/libbuiltins.c
+3: tests/c/libbuiltins.c:20:10: warning: pow is defined in <math.h>, which isn't directly #included.
+3: 
+3: tests/c/libbuiltins.c should add these lines:
+3: #include <math.h>  // for pow
+3: 
+3: tests/c/libbuiltins.c should remove these lines:
+3: - #include "tests/c/libbuiltins-direct.h"  // lines 16-16
+3: 
+3: The full include-list for tests/c/libbuiltins.c:
+3: #include <math.h>  // for pow
+3: ---
+3: 
+  3/158 Test   #1: c.test_elaborated_struct ..........................   Passed    0.40 sec
 test 7
         Start   7: cxx.test_array
 
 7: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/array.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 7: Working Directory: /build/iwyu-8.18
 7: Test timeout computed to be: 10000000
+  4/158 Test   #3: c.test_libbuiltins ................................   Passed    0.43 sec
+test 8
+        Start   8: cxx.test_associated_h_file_heuristic
+
+8: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/associated_h_file_heuristic.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+8: Working Directory: /build/iwyu-8.18
+8: Test timeout computed to be: 10000000
+5: INFO:root:Testing iwyu on tests/cxx/alias_template_use.cc
 6: INFO:root:Testing iwyu on tests/cxx/anonymous_struct.cc
+8: INFO:root:Testing iwyu on tests/cxx/associated_h_file_heuristic.cc
+7: INFO:root:Testing iwyu on tests/cxx/array.cc
 5: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/alias_template_use.cc
 5: tests/cxx/alias_template_use.cc:21:5: warning: AliasTemplate is defined in "alias_template_use-i1.h", which isn't directly #included.
 5: 
@@ -1429,27 +1476,24 @@
 5: #include "alias_template_use-i1.h"  // for AliasTemplate
 5: ---
 5: 
-  5/158 Test   #5: cxx.test_alias_template_use .......................   Passed    1.67 sec
-test 8
-        Start   8: cxx.test_associated_h_file_heuristic
-
-8: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/associated_h_file_heuristic.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-8: Working Directory: /build/iwyu-8.18
-8: Test timeout computed to be: 10000000
 6: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/anonymous_struct.cc
 6: 
 6: (tests/cxx/anonymous_struct.cc has correct #includes/fwd-decls)
 6: 
-  6/158 Test   #6: cxx.test_anonymous_struct .........................   Passed    1.40 sec
+  5/158 Test   #5: cxx.test_alias_template_use .......................   Passed    0.37 sec
 test 9
         Start   9: cxx.test_associated_include
 
 9: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/associated_include.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 9: Working Directory: /build/iwyu-8.18
 9: Test timeout computed to be: 10000000
-8: INFO:root:Testing iwyu on tests/cxx/associated_h_file_heuristic.cc
-7: INFO:root:Testing iwyu on tests/cxx/array.cc
-9: INFO:root:Testing iwyu on tests/cxx/associated_include.cc
+  6/158 Test   #6: cxx.test_anonymous_struct .........................   Passed    0.33 sec
+test 10
+        Start  10: cxx.test_associated_skipped
+
+10: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/associated_skipped.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+10: Working Directory: /build/iwyu-8.18
+10: Test timeout computed to be: 10000000
 7: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/array.cc
 7: tests/cxx/array.cc:18:3: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
 7: tests/cxx/array.cc:20:19: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -1468,34 +1512,13 @@
 7: #include "tests/cxx/indirect.h"  // for IndirectClass
 7: ---
 7: 
-  7/158 Test   #7: cxx.test_array ....................................   Passed    0.99 sec
-test 10
-        Start  10: cxx.test_associated_skipped
+  7/158 Test   #7: cxx.test_array ....................................   Passed    0.35 sec
+test 11
+        Start  11: cxx.test_auto_type_within_template
 
-10: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/associated_skipped.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-10: Working Directory: /build/iwyu-8.18
-10: Test timeout computed to be: 10000000
-9: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/associated_include.cc
-9: 
-9: tests/cxx/associated_include.h should add these lines:
-9: 
-9: tests/cxx/associated_include.h should remove these lines:
-9: - #include "tests/cxx/indirect.h"  // lines 10-10
-9: 
-9: The full include-list for tests/cxx/associated_include.h:
-9: #include "tests/cxx/associated_include-i1.h"  // for AssociatedIncludeClass
-9: ---
-9: 
-9: tests/cxx/associated_include.cc should add these lines:
-9: #include "tests/cxx/indirect.h"  // for IndirectClass
-9: 
-9: tests/cxx/associated_include.cc should remove these lines:
-9: 
-9: The full include-list for tests/cxx/associated_include.cc:
-9: #include "tests/cxx/associated_include.h"
-9: #include "tests/cxx/indirect.h"  // for IndirectClass
-9: ---
-9: 
+11: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/auto_type_within_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+11: Working Directory: /build/iwyu-8.18
+11: Test timeout computed to be: 10000000
 8: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/associated_h_file_heuristic.cc
 8: 
 8: (tests/cxx/internal/associated_h_file_heuristic.h has correct #includes/fwd-decls)
@@ -1510,22 +1533,49 @@
 8: #include <stdio.h>  // for FILE
 8: ---
 8: 
-  8/158 Test   #9: cxx.test_associated_include .......................   Passed    0.97 sec
-test 11
-        Start  11: cxx.test_auto_type_within_template
-
-11: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/auto_type_within_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-11: Working Directory: /build/iwyu-8.18
-11: Test timeout computed to be: 10000000
-  9/158 Test   #8: cxx.test_associated_h_file_heuristic ..............   Passed    1.16 sec
+  8/158 Test   #8: cxx.test_associated_h_file_heuristic ..............   Passed    0.43 sec
 test 12
         Start  12: cxx.test_avoids_double_specialization
 
 12: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/avoids_double_specialization.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 12: Working Directory: /build/iwyu-8.18
 12: Test timeout computed to be: 10000000
+9: INFO:root:Testing iwyu on tests/cxx/associated_include.cc
 10: INFO:root:Testing iwyu on tests/cxx/associated_skipped.cc
+12: INFO:root:Testing iwyu on tests/cxx/avoids_double_specialization.cc
 11: INFO:root:Testing iwyu on tests/cxx/auto_type_within_template.cc
+9: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/associated_include.cc
+9: 
+9: tests/cxx/associated_include.h should add these lines:
+9: 
+9: tests/cxx/associated_include.h should remove these lines:
+9: - #include "tests/cxx/indirect.h"  // lines 10-10
+9: 
+9: The full include-list for tests/cxx/associated_include.h:
+9: #include "tests/cxx/associated_include-i1.h"  // for AssociatedIncludeClass
+9: ---
+9: 
+9: tests/cxx/associated_include.cc should add these lines:
+9: #include "tests/cxx/indirect.h"  // for IndirectClass
+9: 
+9: tests/cxx/associated_include.cc should remove these lines:
+9: 
+9: The full include-list for tests/cxx/associated_include.cc:
+9: #include "tests/cxx/associated_include.h"
+9: #include "tests/cxx/indirect.h"  // for IndirectClass
+9: ---
+9: 
+  9/158 Test   #9: cxx.test_associated_include .......................   Passed    0.58 sec
+test 13
+        Start  13: cxx.test_backwards_includes
+
+13: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/backwards_includes.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+13: Working Directory: /build/iwyu-8.18
+13: Test timeout computed to be: 10000000
+12: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/avoids_double_specialization.cc
+12: 
+12: (tests/cxx/avoids_double_specialization.cc has correct #includes/fwd-decls)
+12: 
 10: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/associated_skipped.cc
 10: 
 10: (tests/cxx/associated_skipped.h has correct #includes/fwd-decls)
@@ -1543,39 +1593,34 @@
 10: #include "tests/cxx/associated_skipped-i1.h"  // for quad
 10: ---
 10: 
- 10/158 Test  #10: cxx.test_associated_skipped .......................   Passed    1.01 sec
-test 13
-        Start  13: cxx.test_backwards_includes
-
-13: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/backwards_includes.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-13: Working Directory: /build/iwyu-8.18
-13: Test timeout computed to be: 10000000
-12: INFO:root:Testing iwyu on tests/cxx/avoids_double_specialization.cc
-11: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11  tests/cxx/auto_type_within_template.cc
-11: 
-11: (tests/cxx/auto_type_within_template.cc has correct #includes/fwd-decls)
-11: 
- 11/158 Test  #11: cxx.test_auto_type_within_template ................   Passed    0.83 sec
+ 10/158 Test  #12: cxx.test_avoids_double_specialization .............   Passed    0.43 sec
 test 14
         Start  14: cxx.test_badinc
 
 14: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/badinc.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 14: Working Directory: /build/iwyu-8.18
 14: Test timeout computed to be: 10000000
-12: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/avoids_double_specialization.cc
-12: 
-12: (tests/cxx/avoids_double_specialization.cc has correct #includes/fwd-decls)
-12: 
-14: INFO:root:Testing iwyu on tests/cxx/badinc.cc
- 12/158 Test  #12: cxx.test_avoids_double_specialization .............   Passed    1.26 sec
+11: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11  tests/cxx/auto_type_within_template.cc
+11: 
+11: (tests/cxx/auto_type_within_template.cc has correct #includes/fwd-decls)
+11: 
+ 11/158 Test  #11: cxx.test_auto_type_within_template ................   Passed    0.60 sec
 test 15
         Start  15: cxx.test_badinc_extradef
 
 15: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/badinc-extradef.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 15: Working Directory: /build/iwyu-8.18
 15: Test timeout computed to be: 10000000
+ 12/158 Test  #10: cxx.test_associated_skipped .......................   Passed    0.66 sec
+test 16
+        Start  16: cxx.test_binary_type_trait
+
+16: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/binary_type_trait.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+16: Working Directory: /build/iwyu-8.18
+16: Test timeout computed to be: 10000000
+14: INFO:root:Testing iwyu on tests/cxx/badinc.cc
 13: INFO:root:Testing iwyu on tests/cxx/backwards_includes.cc
-15: INFO:root:Testing iwyu on tests/cxx/badinc-extradef.cc
+16: INFO:root:Testing iwyu on tests/cxx/binary_type_trait.cc
 13: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-d*.h" -I .  tests/cxx/backwards_includes.cc
 13: 
 13: (tests/cxx/backwards_includes-d1-inl.h has correct #includes/fwd-decls)
@@ -1596,14 +1641,14 @@
 13: 
 13: (tests/cxx/backwards_includes.cc has correct #includes/fwd-decls)
 13: 
- 13/158 Test  #13: cxx.test_backwards_includes .......................   Passed    1.18 sec
-test 16
-        Start  16: cxx.test_binary_type_trait
+15: INFO:root:Testing iwyu on tests/cxx/badinc-extradef.cc
+ 13/158 Test  #13: cxx.test_backwards_includes .......................   Passed    0.38 sec
+test 17
+        Start  17: cxx.test_builtins_no_includes
 
-16: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/binary_type_trait.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-16: Working Directory: /build/iwyu-8.18
-16: Test timeout computed to be: 10000000
-16: INFO:root:Testing iwyu on tests/cxx/binary_type_trait.cc
+17: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/builtins_no_includes.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+17: Working Directory: /build/iwyu-8.18
+17: Test timeout computed to be: 10000000
 16: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/binary_type_trait.cc
 16: tests/cxx/binary_type_trait.cc:19:19: warning: BinaryTypeTraitBase is defined in "tests/cxx/binary_type_trait-i1.h", which isn't directly #included.
 16: tests/cxx/binary_type_trait.cc:19:19: warning: BinaryTypeTraitDerived is defined in "tests/cxx/binary_type_trait-i2.h", which isn't directly #included.
@@ -1630,50 +1675,38 @@
 16: #include "tests/cxx/binary_type_trait-i2.h"  // for BinaryTypeTraitDerived
 16: ---
 16: 
- 14/158 Test  #16: cxx.test_binary_type_trait ........................   Passed    0.97 sec
-test 17
-        Start  17: cxx.test_builtins_no_includes
-
-17: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/builtins_no_includes.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-17: Working Directory: /build/iwyu-8.18
-17: Test timeout computed to be: 10000000
-17: INFO:root:Testing iwyu on tests/cxx/builtins_no_includes.cc
-17: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/builtins_no_includes.cc
-17: 
-17: (tests/cxx/builtins_no_includes.cc has correct #includes/fwd-decls)
-17: 
- 15/158 Test  #17: cxx.test_builtins_no_includes .....................   Passed    1.10 sec
+ 14/158 Test  #16: cxx.test_binary_type_trait ........................   Passed    0.43 sec
 test 18
         Start  18: cxx.test_builtins_template
 
 18: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/builtins_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 18: Working Directory: /build/iwyu-8.18
 18: Test timeout computed to be: 10000000
-18: INFO:root:Testing iwyu on tests/cxx/builtins_template.cc
-18: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/builtins_template.cc
-18: 
-18: (tests/cxx/builtins_template.cc has correct #includes/fwd-decls)
-18: 
- 16/158 Test  #18: cxx.test_builtins_template ........................   Passed    0.85 sec
+17: INFO:root:Testing iwyu on tests/cxx/builtins_no_includes.cc
+17: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/builtins_no_includes.cc
+17: 
+17: (tests/cxx/builtins_no_includes.cc has correct #includes/fwd-decls)
+17: 
+ 15/158 Test  #17: cxx.test_builtins_no_includes .....................   Passed    0.54 sec
 test 19
         Start  19: cxx.test_builtins_with_mapping
 
 19: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/builtins_with_mapping.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 19: Working Directory: /build/iwyu-8.18
 19: Test timeout computed to be: 10000000
-15: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/badinc-extradef.cc
-15: 
-15: (tests/cxx/badinc-extradef.cc has correct #includes/fwd-decls)
-15: 
- 17/158 Test  #15: cxx.test_badinc_extradef ..........................   Passed    3.80 sec
+18: INFO:root:Testing iwyu on tests/cxx/builtins_template.cc
+19: INFO:root:Testing iwyu on tests/cxx/builtins_with_mapping.cc
+18: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/builtins_template.cc
+18: 
+18: (tests/cxx/builtins_template.cc has correct #includes/fwd-decls)
+18: 
+ 16/158 Test  #18: cxx.test_builtins_template ........................   Passed    0.68 sec
 test 20
         Start  20: cxx.test_casts
 
 20: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/casts.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 20: Working Directory: /build/iwyu-8.18
 20: Test timeout computed to be: 10000000
-19: INFO:root:Testing iwyu on tests/cxx/builtins_with_mapping.cc
-20: INFO:root:Testing iwyu on tests/cxx/casts.cc
 19: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --mapping_file=tests/cxx/builtins_with_mapping.imp -I .  tests/cxx/builtins_with_mapping.cc
 19: 
 19: (tests/cxx/builtins_with_mapping.h has correct #includes/fwd-decls)
@@ -1693,7 +1726,8 @@
 19: #include "tests/cxx/builtins_with_mapping-d3.h"  // for __builtin_strlen
 19: ---
 19: 
- 18/158 Test  #19: cxx.test_builtins_with_mapping ....................   Passed    0.95 sec
+20: INFO:root:Testing iwyu on tests/cxx/casts.cc
+ 17/158 Test  #19: cxx.test_builtins_with_mapping ....................   Passed    0.51 sec
 test 21
         Start  21: cxx.test_catch
 
@@ -1726,14 +1760,14 @@
 20: #include "tests/cxx/casts-i3.h"  // for CastsI3Convertible
 20: ---
 20: 
-21: INFO:root:Testing iwyu on tests/cxx/catch.cc
- 19/158 Test  #20: cxx.test_casts ....................................   Passed    1.18 sec
+ 18/158 Test  #20: cxx.test_casts ....................................   Passed    0.41 sec
 test 22
         Start  22: cxx.test_check_also
 
 22: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/check_also.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 22: Working Directory: /build/iwyu-8.18
 22: Test timeout computed to be: 10000000
+21: INFO:root:Testing iwyu on tests/cxx/catch.cc
 21: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -fcxx-exceptions -fexceptions -I .  tests/cxx/catch.cc
 21: tests/cxx/catch.cc:17:18: warning: CatchByValue is defined in "tests/cxx/catch-byvalue.h", which isn't directly #included.
 21: tests/cxx/catch.cc:17:5: warning: CatchByValue is defined in "tests/cxx/catch-byvalue.h", which isn't directly #included.
@@ -1771,14 +1805,18 @@
 21: #include "tests/cxx/catch-thrown.h"   // for Thrown
 21: ---
 21: 
-22: INFO:root:Testing iwyu on tests/cxx/check_also.cc
- 20/158 Test  #21: cxx.test_catch ....................................   Passed    1.02 sec
+ 19/158 Test  #21: cxx.test_catch ....................................   Passed    0.58 sec
 test 23
         Start  23: cxx.test_clmode
 
 23: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/clmode.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 23: Working Directory: /build/iwyu-8.18
 23: Test timeout computed to be: 10000000
+22: INFO:root:Testing iwyu on tests/cxx/check_also.cc
+15: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/badinc-extradef.cc
+15: 
+15: (tests/cxx/badinc-extradef.cc has correct #includes/fwd-decls)
+15: 
 22: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-d1.h" -I .  tests/cxx/check_also.cc
 22: tests/cxx/check_also-d1.h:18:15: warning: NULL is defined in <stddef.h>, which isn't directly #included.
 22: 
@@ -1804,13 +1842,20 @@
 22: #include "tests/cxx/check_also-i1.h"  // for kI1
 22: ---
 22: 
- 21/158 Test  #22: cxx.test_check_also ...............................   Passed    0.86 sec
+ 20/158 Test  #22: cxx.test_check_also ...............................   Passed    0.74 sec
 test 24
         Start  24: cxx.test_comment_pragmas
 
 24: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/comment_pragmas.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 24: Working Directory: /build/iwyu-8.18
 24: Test timeout computed to be: 10000000
+ 21/158 Test  #15: cxx.test_badinc_extradef ..........................   Passed    2.29 sec
+test 25
+        Start  25: cxx.test_computed_include
+
+25: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/computed_include.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+25: Working Directory: /build/iwyu-8.18
+25: Test timeout computed to be: 10000000
 23: INFO:root:Testing iwyu on tests/cxx/clmode.cc
 24: INFO:root:Testing iwyu on tests/cxx/comment_pragmas.cc
 23: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 --driver-mode=cl /GF /Os /W2 -I .  tests/cxx/clmode.cc
@@ -1826,13 +1871,39 @@
 23: #include "tests/cxx/indirect.h"  // for IndirectClass
 23: ---
 23: 
- 22/158 Test  #23: cxx.test_clmode ...................................   Passed    1.11 sec
-test 25
-        Start  25: cxx.test_computed_include
+25: INFO:root:Testing iwyu on tests/cxx/computed_include.cc
+ 22/158 Test  #23: cxx.test_clmode ...................................   Passed    0.60 sec
+test 26
+        Start  26: cxx.test_consteval
 
-25: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/computed_include.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-25: Working Directory: /build/iwyu-8.18
-25: Test timeout computed to be: 10000000
+26: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/consteval.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+26: Working Directory: /build/iwyu-8.18
+26: Test timeout computed to be: 10000000
+25: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/computed_include.cc
+25: 
+25: (tests/cxx/computed_include.h has correct #includes/fwd-decls)
+25: 
+25: tests/cxx/computed_include.cc should add these lines:
+25: 
+25: tests/cxx/computed_include.cc should remove these lines:
+25: - #include "tests/cxx/computed_include.h"  // lines 30-30
+25: - #include <stdio.h>  // lines 24-24
+25: - #include <stdio.h>  // lines 26-26
+25: - #include "tests/cxx/indirect.h"  // lines 19-19
+25: 
+25: The full include-list for tests/cxx/computed_include.cc:
+25: #include "tests/cxx/computed_include.h"
+25: #include "tests/cxx/indirect.h"  // for IndirectClass
+25: ---
+25: 
+26: INFO:root:Testing iwyu on tests/cxx/consteval.cc
+ 23/158 Test  #25: cxx.test_computed_include .........................   Passed    0.41 sec
+test 27
+        Start  27: cxx.test_conversion_ctor
+
+27: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/conversion_ctor.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+27: Working Directory: /build/iwyu-8.18
+27: Test timeout computed to be: 10000000
 24: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/comment_pragmas.cc
 24: tests/cxx/comment_pragmas-d7.h:15:17: warning: @headername directive missing a closing brace
 24: tests/cxx/comment_pragmas-d7.h:22:1: warning: end_exports without a begin_exports
@@ -1904,32 +1975,13 @@
 24: class ForwardDeclaredUnnecessary2;  // lines 115-115
 24: ---
 24: 
- 23/158 Test  #24: cxx.test_comment_pragmas ..........................   Passed    1.02 sec
-test 26
-        Start  26: cxx.test_consteval
+ 24/158 Test  #24: cxx.test_comment_pragmas ..........................   Passed    0.50 sec
+test 28
+        Start  28: cxx.test_ctad
 
-26: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/consteval.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-26: Working Directory: /build/iwyu-8.18
-26: Test timeout computed to be: 10000000
-25: INFO:root:Testing iwyu on tests/cxx/computed_include.cc
-26: INFO:root:Testing iwyu on tests/cxx/consteval.cc
-25: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/computed_include.cc
-25: 
-25: (tests/cxx/computed_include.h has correct #includes/fwd-decls)
-25: 
-25: tests/cxx/computed_include.cc should add these lines:
-25: 
-25: tests/cxx/computed_include.cc should remove these lines:
-25: - #include "tests/cxx/computed_include.h"  // lines 30-30
-25: - #include <stdio.h>  // lines 24-24
-25: - #include <stdio.h>  // lines 26-26
-25: - #include "tests/cxx/indirect.h"  // lines 19-19
-25: 
-25: The full include-list for tests/cxx/computed_include.cc:
-25: #include "tests/cxx/computed_include.h"
-25: #include "tests/cxx/indirect.h"  // for IndirectClass
-25: ---
-25: 
+28: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/ctad.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+28: Working Directory: /build/iwyu-8.18
+28: Test timeout computed to be: 10000000
 26: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I . -std=c++20  tests/cxx/consteval.cc
 26: tests/cxx/consteval.cc:20:21: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
 26: tests/cxx/consteval.cc:24:22: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
@@ -1946,21 +1998,14 @@
 26: #include "tests/cxx/indirect.h"  // for IndirectClass
 26: ---
 26: 
- 24/158 Test  #25: cxx.test_computed_include .........................   Passed    1.19 sec
-test 27
-        Start  27: cxx.test_conversion_ctor
-
-27: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/conversion_ctor.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-27: Working Directory: /build/iwyu-8.18
-27: Test timeout computed to be: 10000000
- 25/158 Test  #26: cxx.test_consteval ................................   Passed    1.09 sec
-test 28
-        Start  28: cxx.test_ctad
-
-28: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/ctad.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-28: Working Directory: /build/iwyu-8.18
-28: Test timeout computed to be: 10000000
 27: INFO:root:Testing iwyu on tests/cxx/conversion_ctor.cc
+ 25/158 Test  #26: cxx.test_consteval ................................   Passed    0.47 sec
+test 29
+        Start  29: cxx.test_cvr
+
+29: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/cvr.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+29: Working Directory: /build/iwyu-8.18
+29: Test timeout computed to be: 10000000
 28: INFO:root:Testing iwyu on tests/cxx/ctad.cc
 27: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11 -I .  tests/cxx/conversion_ctor.cc
 27: tests/cxx/conversion_ctor.cc:18:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -1976,6 +2021,14 @@
 27: #include "tests/cxx/indirect.h"  // for IndirectClass
 27: ---
 27: 
+ 26/158 Test  #27: cxx.test_conversion_ctor ..........................   Passed    0.48 sec
+test 30
+        Start  30: cxx.test_cxx17ns
+
+30: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/cxx17ns.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+30: Working Directory: /build/iwyu-8.18
+30: Test timeout computed to be: 10000000
+29: INFO:root:Testing iwyu on tests/cxx/cvr.cc
 28: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I . -std=c++17  tests/cxx/ctad.cc
 28: tests/cxx/ctad.cc:19:3: warning: Deduced is defined in "tests/cxx/ctad-i1.h", which isn't directly #included.
 28: 
@@ -1989,22 +2042,28 @@
 28: #include "tests/cxx/ctad-i1.h"  // for Deduced
 28: ---
 28: 
- 26/158 Test  #27: cxx.test_conversion_ctor ..........................   Passed    1.13 sec
-test 29
-        Start  29: cxx.test_cvr
+ 27/158 Test  #28: cxx.test_ctad .....................................   Passed    0.61 sec
+test 31
+        Start  31: cxx.test_default_template_arg_other_file
 
-29: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/cvr.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-29: Working Directory: /build/iwyu-8.18
-29: Test timeout computed to be: 10000000
- 27/158 Test  #28: cxx.test_ctad .....................................   Passed    1.06 sec
-test 30
-        Start  30: cxx.test_cxx17ns
+31: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/default_template_arg_other_file.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+31: Working Directory: /build/iwyu-8.18
+31: Test timeout computed to be: 10000000
+29: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/cvr.cc
+29: Found covariant return type in ReturnsDerived::covariant_derived, needs complete type of class Derived.
+29: Found covariant return type in ReturnsDerived::covariant_cv_qual, needs complete type of class Class.
+29: 
+29: (tests/cxx/cvr.cc has correct #includes/fwd-decls)
+29: 
+ 28/158 Test  #29: cxx.test_cvr ......................................   Passed    0.51 sec
+test 32
+        Start  32: cxx.test_defn_is_use
 
-30: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/cxx17ns.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-30: Working Directory: /build/iwyu-8.18
-30: Test timeout computed to be: 10000000
-29: INFO:root:Testing iwyu on tests/cxx/cvr.cc
+32: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/defn_is_use.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+32: Working Directory: /build/iwyu-8.18
+32: Test timeout computed to be: 10000000
 30: INFO:root:Testing iwyu on tests/cxx/cxx17ns.cc
+31: INFO:root:Testing iwyu on tests/cxx/default_template_arg_other_file.cc
 30: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --cxx17ns -std=c++17 -I .  tests/cxx/cxx17ns.cc
 30: 
 30: tests/cxx/cxx17ns.cc should add these lines:
@@ -2023,32 +2082,14 @@
 30: namespace a::b::c { struct One; }
 30: ---
 30: 
-29: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/cvr.cc
-29: Found covariant return type in ReturnsDerived::covariant_derived, needs complete type of class Derived.
-29: Found covariant return type in ReturnsDerived::covariant_cv_qual, needs complete type of class Class.
-29: 
-29: (tests/cxx/cvr.cc has correct #includes/fwd-decls)
-29: 
- 28/158 Test  #30: cxx.test_cxx17ns ..................................   Passed    0.74 sec
-test 31
-        Start  31: cxx.test_default_template_arg_other_file
-
-31: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/default_template_arg_other_file.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-31: Working Directory: /build/iwyu-8.18
-31: Test timeout computed to be: 10000000
- 29/158 Test  #29: cxx.test_cvr ......................................   Passed    0.84 sec
-test 32
-        Start  32: cxx.test_defn_is_use
-
-32: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/defn_is_use.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-32: Working Directory: /build/iwyu-8.18
-32: Test timeout computed to be: 10000000
-31: INFO:root:Testing iwyu on tests/cxx/default_template_arg_other_file.cc
 32: INFO:root:Testing iwyu on tests/cxx/defn_is_use.cc
-32: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/defn_is_use.cc
-32: 
-32: (tests/cxx/defn_is_use.cc has correct #includes/fwd-decls)
-32: 
+ 29/158 Test  #30: cxx.test_cxx17ns ..................................   Passed    0.57 sec
+test 33
+        Start  33: cxx.test_deleted_implicit
+
+33: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/deleted_implicit.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+33: Working Directory: /build/iwyu-8.18
+33: Test timeout computed to be: 10000000
 31: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/default_template_arg_other_file.cc
 31: tests/cxx/default_template_arg_other_file.cc:24:18: warning: MyClass needs a declaration, but does not provide or directly #include one.
 31: tests/cxx/default_template_arg_other_file.cc:26:3: warning: OperateOn is defined in "tests/cxx/default_template_arg_other_file-i2.h", which isn't directly #included.
@@ -2070,14 +2111,11 @@
 31: #include "tests/cxx/default_template_arg_other_file-i2.h"  // for MyClass (ptr only), OperateOn, TplClass (ptr only)
 31: ---
 31: 
- 30/158 Test  #32: cxx.test_defn_is_use ..............................   Passed    1.36 sec
-test 33
-        Start  33: cxx.test_deleted_implicit
-
-33: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/deleted_implicit.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-33: Working Directory: /build/iwyu-8.18
-33: Test timeout computed to be: 10000000
- 31/158 Test  #31: cxx.test_default_template_arg_other_file ..........   Passed    1.42 sec
+32: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/defn_is_use.cc
+32: 
+32: (tests/cxx/defn_is_use.cc has correct #includes/fwd-decls)
+32: 
+ 30/158 Test  #31: cxx.test_default_template_arg_other_file ..........   Passed    0.49 sec
 test 34
         Start  34: cxx.test_depopulated_h_file
 
@@ -2085,6 +2123,13 @@
 34: Working Directory: /build/iwyu-8.18
 34: Test timeout computed to be: 10000000
 33: INFO:root:Testing iwyu on tests/cxx/deleted_implicit.cc
+ 31/158 Test  #32: cxx.test_defn_is_use ..............................   Passed    0.41 sec
+test 35
+        Start  35: cxx.test_derived_function_tpl_args
+
+35: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/derived_function_tpl_args.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+35: Working Directory: /build/iwyu-8.18
+35: Test timeout computed to be: 10000000
 34: INFO:root:Testing iwyu on tests/cxx/depopulated_h_file.cc
 33: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11  tests/cxx/deleted_implicit.cc
 33: tests/cxx/deleted_implicit.cc:20:7: warning: class 'ReferenceMember' does not declare any constructor to initialize its non-modifiable members
@@ -2102,13 +2147,14 @@
 33: 
 33: (tests/cxx/deleted_implicit.cc has correct #includes/fwd-decls)
 33: 
- 32/158 Test  #33: cxx.test_deleted_implicit .........................   Passed    0.64 sec
-test 35
-        Start  35: cxx.test_derived_function_tpl_args
+ 32/158 Test  #33: cxx.test_deleted_implicit .........................   Passed    0.38 sec
+test 36
+        Start  36: cxx.test_dotdot
 
-35: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/derived_function_tpl_args.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-35: Working Directory: /build/iwyu-8.18
-35: Test timeout computed to be: 10000000
+36: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/dotdot.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+36: Working Directory: /build/iwyu-8.18
+36: Test timeout computed to be: 10000000
+35: INFO:root:Testing iwyu on tests/cxx/derived_function_tpl_args.cc
 34: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/depopulated_h_file.cc
 34: 
 34: tests/cxx/depopulated_h_file.h should add these lines:
@@ -2129,14 +2175,13 @@
 34: #include "tests/cxx/depopulated_h_file-i1.h"  // for Foo
 34: ---
 34: 
- 33/158 Test  #34: cxx.test_depopulated_h_file .......................   Passed    0.77 sec
-test 36
-        Start  36: cxx.test_dotdot
+ 33/158 Test  #34: cxx.test_depopulated_h_file .......................   Passed    0.44 sec
+test 37
+        Start  37: cxx.test_double_include
 
-36: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/dotdot.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-36: Working Directory: /build/iwyu-8.18
-36: Test timeout computed to be: 10000000
-35: INFO:root:Testing iwyu on tests/cxx/derived_function_tpl_args.cc
+37: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/double_include.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+37: Working Directory: /build/iwyu-8.18
+37: Test timeout computed to be: 10000000
 36: INFO:root:Testing iwyu on tests/cxx/dotdot.cc
 35: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/derived_function_tpl_args.cc
 35: tests/cxx/derived_function_tpl_args.cc:42:3: warning: IndirectClass is defined in "tests/cxx/derived_function_tpl_args-i1.h", which isn't directly #included.
@@ -2180,13 +2225,13 @@
 35: #include "tests/cxx/derived_function_tpl_args-i1.h"  // for IndirectTplClass, IndirectClass, NsClass
 35: ---
 35: 
- 34/158 Test  #35: cxx.test_derived_function_tpl_args ................   Passed    0.95 sec
-test 37
-        Start  37: cxx.test_double_include
+ 34/158 Test  #35: cxx.test_derived_function_tpl_args ................   Passed    0.63 sec
+test 38
+        Start  38: cxx.test_elaborated_type
 
-37: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/double_include.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-37: Working Directory: /build/iwyu-8.18
-37: Test timeout computed to be: 10000000
+38: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/elaborated_type.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+38: Working Directory: /build/iwyu-8.18
+38: Test timeout computed to be: 10000000
 36: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/dotdot.cc
 36: tests/cxx/dotdot.cc:18:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 36: 
@@ -2200,15 +2245,227 @@
 36: #include "tests/cxx/indirect.h"  // for IndirectClass
 36: ---
 36: 
- 35/158 Test  #36: cxx.test_dotdot ...................................   Passed    0.90 sec
-test 38
-        Start  38: cxx.test_elaborated_type
+ 35/158 Test  #36: cxx.test_dotdot ...................................   Passed    0.50 sec
+test 39
+        Start  39: cxx.test_enum_base
 
-38: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/elaborated_type.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-38: Working Directory: /build/iwyu-8.18
-38: Test timeout computed to be: 10000000
+39: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/enum_base.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+39: Working Directory: /build/iwyu-8.18
+39: Test timeout computed to be: 10000000
 37: INFO:root:Testing iwyu on tests/cxx/double_include.cc
 38: INFO:root:Testing iwyu on tests/cxx/elaborated_type.cc
+37: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/double_include.cc
+37: 
+37: (tests/cxx/double_include.h has correct #includes/fwd-decls)
+37: 
+37: tests/cxx/double_include.cc should add these lines:
+37: 
+37: tests/cxx/double_include.cc should remove these lines:
+37: - #include "tests/cxx/double_include.h"  // lines 24-24
+37: 
+37: The full include-list for tests/cxx/double_include.cc:
+37: #include "tests/cxx/double_include.h"
+37: ---
+37: 
+ 36/158 Test  #37: cxx.test_double_include ...........................   Passed    0.63 sec
+test 40
+        Start  40: cxx.test_explicit_instantiation
+
+40: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/explicit_instantiation.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+40: Working Directory: /build/iwyu-8.18
+40: Test timeout computed to be: 10000000
+39: INFO:root:Testing iwyu on tests/cxx/enum_base.cc
+38: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/elaborated_type.cc
+38: 
+38: tests/cxx/elaborated_type.cc should add these lines:
+38: class ElaborationClass;
+38: namespace Elaboration { class Class; }
+38: namespace Elaboration { template <typename T, typename U> struct Template; }
+38: struct ElaborationStruct;
+38: union ElaborationUnion;
+38: 
+38: tests/cxx/elaborated_type.cc should remove these lines:
+38: - #include "tests/cxx/elaborated_type_class.h"  // lines 32-32
+38: - #include "tests/cxx/elaborated_type_namespace.h"  // lines 52-52
+38: - #include "tests/cxx/elaborated_type_struct.h"  // lines 38-38
+38: - #include "tests/cxx/elaborated_type_union.h"  // lines 44-44
+38: 
+38: The full include-list for tests/cxx/elaborated_type.cc:
+38: #include "tests/cxx/elaborated_type_enum1.h"  // for ElaborationEnum1
+38: #include "tests/cxx/elaborated_type_enum2.h"  // for ElaborationEnum2
+38: class ElaborationClass;
+38: class GlobalClass;  // lines 24-24
+38: namespace Elaboration { class Class; }
+38: namespace Elaboration { template <typename T, typename U> struct Template; }
+38: struct ElaborationStruct;
+38: union ElaborationUnion;
+38: ---
+38: 
+39: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/enum_base.cc
+39: tests/cxx/enum_base.cc:15:12: warning: int_t is defined in "tests/cxx/enum_base-i1.h", which isn't directly #included.
+39: tests/cxx/enum_base.cc:15:19: warning: int_t is defined in "tests/cxx/enum_base-i1.h", which isn't directly #included.
+39: 
+39: tests/cxx/enum_base.cc should add these lines:
+39: #include "tests/cxx/enum_base-i1.h"  // for int_t
+39: 
+39: tests/cxx/enum_base.cc should remove these lines:
+39: - #include "tests/cxx/enum_base-d1.h"  // lines 12-12
+39: 
+39: The full include-list for tests/cxx/enum_base.cc:
+39: #include "tests/cxx/enum_base-i1.h"  // for int_t
+39: ---
+39: 
+40: INFO:root:Testing iwyu on tests/cxx/explicit_instantiation.cc
+ 37/158 Test  #38: cxx.test_elaborated_type ..........................   Passed    0.58 sec
+test 41
+        Start  41: cxx.test_explicit_instantiation2
+
+41: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/explicit_instantiation2.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+41: Working Directory: /build/iwyu-8.18
+41: Test timeout computed to be: 10000000
+ 38/158 Test  #39: cxx.test_enum_base ................................   Passed    0.50 sec
+test 42
+        Start  42: cxx.test_export_nesting
+
+42: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/export_nesting.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+42: Working Directory: /build/iwyu-8.18
+42: Test timeout computed to be: 10000000
+40: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/explicit_instantiation.cc
+40: tests/cxx/explicit_instantiation.cc:17:23: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+40: tests/cxx/explicit_instantiation.cc:19:16: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+40: tests/cxx/explicit_instantiation.cc:23:23: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+40: tests/cxx/explicit_instantiation.cc:27:16: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+40: tests/cxx/explicit_instantiation.cc:33:18: warning: Template needs a declaration, but does not provide or directly #include one.
+40: 
+40: tests/cxx/explicit_instantiation.cc should add these lines:
+40: #include "explicit_instantiation-template.h"  // for Template
+40: 
+40: tests/cxx/explicit_instantiation.cc should remove these lines:
+40: - #include "explicit_instantiation-template_direct.h"  // lines 10-10
+40: 
+40: The full include-list for tests/cxx/explicit_instantiation.cc:
+40: #include "explicit_instantiation-template.h"  // for Template
+40: ---
+40: 
+42: INFO:root:Testing iwyu on tests/cxx/export_nesting.cc
+ 39/158 Test  #40: cxx.test_explicit_instantiation ...................   Passed    0.35 sec
+test 43
+        Start  43: cxx.test_external_including_internal
+
+43: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/external_including_internal.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+43: Working Directory: /build/iwyu-8.18
+43: Test timeout computed to be: 10000000
+41: INFO:root:Testing iwyu on tests/cxx/explicit_instantiation2.cc
+42: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/export_nesting.cc
+42: 
+42: (tests/cxx/export_nesting.h has correct #includes/fwd-decls)
+42: 
+42: (tests/cxx/export_nesting.cc has correct #includes/fwd-decls)
+42: 
+ 40/158 Test  #42: cxx.test_export_nesting ...........................   Passed    0.39 sec
+test 44
+        Start  44: cxx.test_forward_declare_in_macro
+
+44: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/forward_declare_in_macro.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+44: Working Directory: /build/iwyu-8.18
+44: Test timeout computed to be: 10000000
+43: INFO:root:Testing iwyu on tests/cxx/external_including_internal.cc
+41: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/explicit_instantiation2.cc
+41: tests/cxx/explicit_instantiation2.cc:38:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:38:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
+41: tests/cxx/explicit_instantiation2.cc:42:16: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:42:16: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
+41: tests/cxx/explicit_instantiation2.cc:46:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:46:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
+41: tests/cxx/explicit_instantiation2.cc:50:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:50:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
+41: tests/cxx/explicit_instantiation2.cc:52:5: warning: Template needs a declaration, but does not provide or directly #include one.
+41: tests/cxx/explicit_instantiation2.cc:54:5: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:57:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
+41: tests/cxx/explicit_instantiation2.cc:59:5: warning: Template needs a declaration, but does not provide or directly #include one.
+41: tests/cxx/explicit_instantiation2.cc:64:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:64:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
+41: tests/cxx/explicit_instantiation2.cc:64:25: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:68:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
+41: tests/cxx/explicit_instantiation2.cc:70:5: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:75:5: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:79:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
+41: tests/cxx/explicit_instantiation2.cc:82:19: warning: Template needs a declaration, but does not provide or directly #include one.
+41: 
+41: tests/cxx/explicit_instantiation2.cc should add these lines:
+41: #include "explicit_instantiation-template.h"           // for Template
+41: #include "explicit_instantiation2-template_short.h"    // for Template
+41: 
+41: tests/cxx/explicit_instantiation2.cc should remove these lines:
+41: - #include "explicit_instantiation-template_direct.h"  // lines 10-10
+41: - #include "explicit_instantiation2-template_short_direct.h"  // lines 12-12
+41: 
+41: The full include-list for tests/cxx/explicit_instantiation2.cc:
+41: #include "explicit_instantiation-template.h"           // for Template
+41: #include "explicit_instantiation2-template_helpers.h"  // for TemplateAsDefaultFull, FullUseArg, FwdDeclUseArg, TemplateAsDefaultFullProvided, TemplateAsDefaultFwd, TemplateTemplateArgShortFull, TemplateTemplateArgShortFwd
+41: #include "explicit_instantiation2-template_short.h"    // for Template
+41: ---
+41: 
+ 41/158 Test  #41: cxx.test_explicit_instantiation2 ..................   Passed    0.49 sec
+test 45
+        Start  45: cxx.test_fullinfo_for_templates
+
+45: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fullinfo_for_templates.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+45: Working Directory: /build/iwyu-8.18
+45: Test timeout computed to be: 10000000
+44: INFO:root:Testing iwyu on tests/cxx/forward_declare_in_macro.cc
+43: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/external_including_internal.cc
+43: 
+43: (tests/cxx/external_including_internal.cc has correct #includes/fwd-decls)
+43: 
+ 42/158 Test  #43: cxx.test_external_including_internal ..............   Passed    0.51 sec
+test 46
+        Start  46: cxx.test_funcptrs
+
+46: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/funcptrs.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+46: Working Directory: /build/iwyu-8.18
+46: Test timeout computed to be: 10000000
+45: INFO:root:Testing iwyu on tests/cxx/fullinfo_for_templates.cc
+44: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/forward_declare_in_macro.cc
+44: 
+44: (tests/cxx/forward_declare_in_macro.h has correct #includes/fwd-decls)
+44: 
+44: tests/cxx/forward_declare_in_macro.cc should add these lines:
+44: 
+44: tests/cxx/forward_declare_in_macro.cc should remove these lines:
+44: - class MyClass;  // lines 31-31
+44: 
+44: The full include-list for tests/cxx/forward_declare_in_macro.cc:
+44: #include "tests/cxx/forward_declare_in_macro.h"
+44: ---
+44: 
+ 43/158 Test  #44: cxx.test_forward_declare_in_macro .................   Passed    0.58 sec
+test 47
+        Start  47: cxx.test_fwd_decl_class_template
+
+47: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_class_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+47: Working Directory: /build/iwyu-8.18
+47: Test timeout computed to be: 10000000
+45: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/fullinfo_for_templates.cc
+45: 
+45: tests/cxx/fullinfo_for_templates.cc should add these lines:
+45: 
+45: tests/cxx/fullinfo_for_templates.cc should remove these lines:
+45: - #include "tests/cxx/fullinfo_for_templates-d2.h"  // lines 18-18
+45: 
+45: The full include-list for tests/cxx/fullinfo_for_templates.cc:
+45: #include "tests/cxx/fullinfo_for_templates-d1.h"  // for TemplateClass
+45: ---
+45: 
+46: INFO:root:Testing iwyu on tests/cxx/funcptrs.cc
+ 44/158 Test  #45: cxx.test_fullinfo_for_templates ...................   Passed    0.63 sec
+test 48
+        Start  48: cxx.test_fwd_decl_final
+
+48: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_final.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+48: Working Directory: /build/iwyu-8.18
+48: Test timeout computed to be: 10000000
+47: INFO:root:Testing iwyu on tests/cxx/fwd_decl_class_template.cc
 14: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --mapping_file=tests/cxx/badinc.imp -I .  tests/cxx/badinc.cc
 14: 
 14: (tests/cxx/badinc-inl.h has correct #includes/fwd-decls)
@@ -3192,218 +3449,6 @@
 14: template <typename T> struct I3_SimpleForwardDeclareTemplateStruct;  // lines 160-161
 14: ---
 14: 
-37: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/double_include.cc
-37: 
-37: (tests/cxx/double_include.h has correct #includes/fwd-decls)
-37: 
-37: tests/cxx/double_include.cc should add these lines:
-37: 
-37: tests/cxx/double_include.cc should remove these lines:
-37: - #include "tests/cxx/double_include.h"  // lines 24-24
-37: 
-37: The full include-list for tests/cxx/double_include.cc:
-37: #include "tests/cxx/double_include.h"
-37: ---
-37: 
- 36/158 Test  #37: cxx.test_double_include ...........................   Passed    0.75 sec
-test 39
-        Start  39: cxx.test_enum_base
-
-39: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/enum_base.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-39: Working Directory: /build/iwyu-8.18
-39: Test timeout computed to be: 10000000
- 37/158 Test  #14: cxx.test_badinc ...................................   Passed   14.21 sec
-test 40
-        Start  40: cxx.test_explicit_instantiation
-
-40: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/explicit_instantiation.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-40: Working Directory: /build/iwyu-8.18
-40: Test timeout computed to be: 10000000
-38: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/elaborated_type.cc
-38: 
-38: tests/cxx/elaborated_type.cc should add these lines:
-38: class ElaborationClass;
-38: namespace Elaboration { class Class; }
-38: namespace Elaboration { template <typename T, typename U> struct Template; }
-38: struct ElaborationStruct;
-38: union ElaborationUnion;
-38: 
-38: tests/cxx/elaborated_type.cc should remove these lines:
-38: - #include "tests/cxx/elaborated_type_class.h"  // lines 32-32
-38: - #include "tests/cxx/elaborated_type_namespace.h"  // lines 52-52
-38: - #include "tests/cxx/elaborated_type_struct.h"  // lines 38-38
-38: - #include "tests/cxx/elaborated_type_union.h"  // lines 44-44
-38: 
-38: The full include-list for tests/cxx/elaborated_type.cc:
-38: #include "tests/cxx/elaborated_type_enum1.h"  // for ElaborationEnum1
-38: #include "tests/cxx/elaborated_type_enum2.h"  // for ElaborationEnum2
-38: class ElaborationClass;
-38: class GlobalClass;  // lines 24-24
-38: namespace Elaboration { class Class; }
-38: namespace Elaboration { template <typename T, typename U> struct Template; }
-38: struct ElaborationStruct;
-38: union ElaborationUnion;
-38: ---
-38: 
- 38/158 Test  #38: cxx.test_elaborated_type ..........................   Passed    1.03 sec
-test 41
-        Start  41: cxx.test_explicit_instantiation2
-
-41: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/explicit_instantiation2.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-41: Working Directory: /build/iwyu-8.18
-41: Test timeout computed to be: 10000000
-39: INFO:root:Testing iwyu on tests/cxx/enum_base.cc
-41: INFO:root:Testing iwyu on tests/cxx/explicit_instantiation2.cc
-40: INFO:root:Testing iwyu on tests/cxx/explicit_instantiation.cc
-39: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/enum_base.cc
-39: tests/cxx/enum_base.cc:15:12: warning: int_t is defined in "tests/cxx/enum_base-i1.h", which isn't directly #included.
-39: tests/cxx/enum_base.cc:15:19: warning: int_t is defined in "tests/cxx/enum_base-i1.h", which isn't directly #included.
-39: 
-39: tests/cxx/enum_base.cc should add these lines:
-39: #include "tests/cxx/enum_base-i1.h"  // for int_t
-39: 
-39: tests/cxx/enum_base.cc should remove these lines:
-39: - #include "tests/cxx/enum_base-d1.h"  // lines 12-12
-39: 
-39: The full include-list for tests/cxx/enum_base.cc:
-39: #include "tests/cxx/enum_base-i1.h"  // for int_t
-39: ---
-39: 
- 39/158 Test  #39: cxx.test_enum_base ................................   Passed    0.97 sec
-test 42
-        Start  42: cxx.test_export_nesting
-
-42: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/export_nesting.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-42: Working Directory: /build/iwyu-8.18
-42: Test timeout computed to be: 10000000
-41: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/explicit_instantiation2.cc
-41: tests/cxx/explicit_instantiation2.cc:38:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:38:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
-41: tests/cxx/explicit_instantiation2.cc:42:16: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:42:16: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
-41: tests/cxx/explicit_instantiation2.cc:46:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:46:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
-41: tests/cxx/explicit_instantiation2.cc:50:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:50:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
-41: tests/cxx/explicit_instantiation2.cc:52:5: warning: Template needs a declaration, but does not provide or directly #include one.
-41: tests/cxx/explicit_instantiation2.cc:54:5: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:57:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
-41: tests/cxx/explicit_instantiation2.cc:59:5: warning: Template needs a declaration, but does not provide or directly #include one.
-41: tests/cxx/explicit_instantiation2.cc:64:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:64:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
-41: tests/cxx/explicit_instantiation2.cc:64:25: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:68:1: warning: Template is defined in "explicit_instantiation2-template_short.h", which isn't directly #included (for explicit instantiation).
-41: tests/cxx/explicit_instantiation2.cc:70:5: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:75:5: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:79:1: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-41: tests/cxx/explicit_instantiation2.cc:82:19: warning: Template needs a declaration, but does not provide or directly #include one.
-41: 
-41: tests/cxx/explicit_instantiation2.cc should add these lines:
-41: #include "explicit_instantiation-template.h"           // for Template
-41: #include "explicit_instantiation2-template_short.h"    // for Template
-41: 
-41: tests/cxx/explicit_instantiation2.cc should remove these lines:
-41: - #include "explicit_instantiation-template_direct.h"  // lines 10-10
-41: - #include "explicit_instantiation2-template_short_direct.h"  // lines 12-12
-41: 
-41: The full include-list for tests/cxx/explicit_instantiation2.cc:
-41: #include "explicit_instantiation-template.h"           // for Template
-41: #include "explicit_instantiation2-template_helpers.h"  // for TemplateAsDefaultFull, FullUseArg, FwdDeclUseArg, TemplateAsDefaultFullProvided, TemplateAsDefaultFwd, TemplateTemplateArgShortFull, TemplateTemplateArgShortFwd
-41: #include "explicit_instantiation2-template_short.h"    // for Template
-41: ---
-41: 
-40: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/explicit_instantiation.cc
-40: tests/cxx/explicit_instantiation.cc:17:23: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-40: tests/cxx/explicit_instantiation.cc:19:16: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-40: tests/cxx/explicit_instantiation.cc:23:23: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-40: tests/cxx/explicit_instantiation.cc:27:16: warning: Template is defined in "explicit_instantiation-template.h", which isn't directly #included.
-40: tests/cxx/explicit_instantiation.cc:33:18: warning: Template needs a declaration, but does not provide or directly #include one.
-40: 
-40: tests/cxx/explicit_instantiation.cc should add these lines:
-40: #include "explicit_instantiation-template.h"  // for Template
-40: 
-40: tests/cxx/explicit_instantiation.cc should remove these lines:
-40: - #include "explicit_instantiation-template_direct.h"  // lines 10-10
-40: 
-40: The full include-list for tests/cxx/explicit_instantiation.cc:
-40: #include "explicit_instantiation-template.h"  // for Template
-40: ---
-40: 
- 40/158 Test  #41: cxx.test_explicit_instantiation2 ..................   Passed    0.82 sec
-test 43
-        Start  43: cxx.test_external_including_internal
-
-43: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/external_including_internal.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-43: Working Directory: /build/iwyu-8.18
-43: Test timeout computed to be: 10000000
- 41/158 Test  #40: cxx.test_explicit_instantiation ...................   Passed    1.09 sec
-test 44
-        Start  44: cxx.test_forward_declare_in_macro
-
-44: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/forward_declare_in_macro.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-44: Working Directory: /build/iwyu-8.18
-44: Test timeout computed to be: 10000000
-42: INFO:root:Testing iwyu on tests/cxx/export_nesting.cc
-43: INFO:root:Testing iwyu on tests/cxx/external_including_internal.cc
-44: INFO:root:Testing iwyu on tests/cxx/forward_declare_in_macro.cc
-42: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/export_nesting.cc
-42: 
-42: (tests/cxx/export_nesting.h has correct #includes/fwd-decls)
-42: 
-42: (tests/cxx/export_nesting.cc has correct #includes/fwd-decls)
-42: 
-43: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/external_including_internal.cc
-43: 
-43: (tests/cxx/external_including_internal.cc has correct #includes/fwd-decls)
-43: 
- 42/158 Test  #42: cxx.test_export_nesting ...........................   Passed    1.14 sec
-test 45
-        Start  45: cxx.test_fullinfo_for_templates
-
-45: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fullinfo_for_templates.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-45: Working Directory: /build/iwyu-8.18
-45: Test timeout computed to be: 10000000
- 43/158 Test  #43: cxx.test_external_including_internal ..............   Passed    0.94 sec
-test 46
-        Start  46: cxx.test_funcptrs
-
-46: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/funcptrs.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-46: Working Directory: /build/iwyu-8.18
-46: Test timeout computed to be: 10000000
-44: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/forward_declare_in_macro.cc
-44: 
-44: (tests/cxx/forward_declare_in_macro.h has correct #includes/fwd-decls)
-44: 
-44: tests/cxx/forward_declare_in_macro.cc should add these lines:
-44: 
-44: tests/cxx/forward_declare_in_macro.cc should remove these lines:
-44: - class MyClass;  // lines 31-31
-44: 
-44: The full include-list for tests/cxx/forward_declare_in_macro.cc:
-44: #include "tests/cxx/forward_declare_in_macro.h"
-44: ---
-44: 
- 44/158 Test  #44: cxx.test_forward_declare_in_macro .................   Passed    0.90 sec
-test 47
-        Start  47: cxx.test_fwd_decl_class_template
-
-47: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_class_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-47: Working Directory: /build/iwyu-8.18
-47: Test timeout computed to be: 10000000
-45: INFO:root:Testing iwyu on tests/cxx/fullinfo_for_templates.cc
-46: INFO:root:Testing iwyu on tests/cxx/funcptrs.cc
-47: INFO:root:Testing iwyu on tests/cxx/fwd_decl_class_template.cc
-45: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/fullinfo_for_templates.cc
-45: 
-45: tests/cxx/fullinfo_for_templates.cc should add these lines:
-45: 
-45: tests/cxx/fullinfo_for_templates.cc should remove these lines:
-45: - #include "tests/cxx/fullinfo_for_templates-d2.h"  // lines 18-18
-45: 
-45: The full include-list for tests/cxx/fullinfo_for_templates.cc:
-45: #include "tests/cxx/fullinfo_for_templates-d1.h"  // for TemplateClass
-45: ---
-45: 
 47: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/fwd_decl_class_template.cc
 47: 
 47: tests/cxx/fwd_decl_class_template.h should add these lines:
@@ -3525,30 +3570,64 @@
 46: #include "tests/cxx/funcptrs-i1.h"  // for Retval, Class, ClassTemplate, Function, FunctionTemplate, Enum
 46: ---
 46: 
- 45/158 Test  #47: cxx.test_fwd_decl_class_template ..................   Passed    1.03 sec
-test 48
-        Start  48: cxx.test_fwd_decl_final
-
-48: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_final.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-48: Working Directory: /build/iwyu-8.18
-48: Test timeout computed to be: 10000000
- 46/158 Test  #45: cxx.test_fullinfo_for_templates ...................   Passed    1.19 sec
+ 45/158 Test  #46: cxx.test_funcptrs .................................   Passed    0.65 sec
 test 49
         Start  49: cxx.test_fwd_decl_nested_class
 
 49: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_nested_class.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 49: Working Directory: /build/iwyu-8.18
 49: Test timeout computed to be: 10000000
- 47/158 Test  #46: cxx.test_funcptrs .................................   Passed    1.24 sec
+48: INFO:root:Testing iwyu on tests/cxx/fwd_decl_final.cc
+ 46/158 Test  #47: cxx.test_fwd_decl_class_template ..................   Passed    0.39 sec
 test 50
         Start  50: cxx.test_fwd_decl_of_nested_class_defined_later
 
 50: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_of_nested_class_defined_later.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 50: Working Directory: /build/iwyu-8.18
 50: Test timeout computed to be: 10000000
-49: INFO:root:Testing iwyu on tests/cxx/fwd_decl_nested_class.cc
-48: INFO:root:Testing iwyu on tests/cxx/fwd_decl_final.cc
+ 47/158 Test  #14: cxx.test_badinc ...................................   Passed    6.63 sec
+test 51
+        Start  51: cxx.test_fwd_decl_static_member
+
+51: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_static_member.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+51: Working Directory: /build/iwyu-8.18
+51: Test timeout computed to be: 10000000
 50: INFO:root:Testing iwyu on tests/cxx/fwd_decl_of_nested_class_defined_later.cc
+48: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/fwd_decl_final.cc
+48: 
+48: tests/cxx/fwd_decl_final.h should add these lines:
+48: class FinalClass;
+48: template <typename T> class FinalTemplate;
+48: 
+48: tests/cxx/fwd_decl_final.h should remove these lines:
+48: - #include "tests/cxx/fwd_decl_final-d1.h"  // lines 13-13
+48: 
+48: The full include-list for tests/cxx/fwd_decl_final.h:
+48: class FinalClass;
+48: template <typename T> class FinalTemplate;
+48: ---
+48: 
+48: tests/cxx/fwd_decl_final.cc should add these lines:
+48: class FinalClass;
+48: template <typename T> class FinalTemplate;
+48: 
+48: tests/cxx/fwd_decl_final.cc should remove these lines:
+48: 
+48: The full include-list for tests/cxx/fwd_decl_final.cc:
+48: #include "tests/cxx/fwd_decl_final.h"
+48: class FinalClass;
+48: template <typename T> class FinalTemplate;
+48: ---
+48: 
+49: INFO:root:Testing iwyu on tests/cxx/fwd_decl_nested_class.cc
+51: INFO:root:Testing iwyu on tests/cxx/fwd_decl_static_member.cc
+ 48/158 Test  #48: cxx.test_fwd_decl_final ...........................   Passed    0.49 sec
+test 52
+        Start  52: cxx.test_fwd_decl_then_dfn
+
+52: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_then_dfn.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+52: Working Directory: /build/iwyu-8.18
+52: Test timeout computed to be: 10000000
 49: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_decl_nested_class.cc
 49: 
 49: tests/cxx/fwd_decl_nested_class.cc should add these lines:
@@ -3591,70 +3670,14 @@
 49: template <typename T> class Outer::UsedInTypedef;  // lines 88-88
 49: ---
 49: 
-48: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/fwd_decl_final.cc
-48: 
-48: tests/cxx/fwd_decl_final.h should add these lines:
-48: class FinalClass;
-48: template <typename T> class FinalTemplate;
-48: 
-48: tests/cxx/fwd_decl_final.h should remove these lines:
-48: - #include "tests/cxx/fwd_decl_final-d1.h"  // lines 13-13
-48: 
-48: The full include-list for tests/cxx/fwd_decl_final.h:
-48: class FinalClass;
-48: template <typename T> class FinalTemplate;
-48: ---
-48: 
-48: tests/cxx/fwd_decl_final.cc should add these lines:
-48: class FinalClass;
-48: template <typename T> class FinalTemplate;
-48: 
-48: tests/cxx/fwd_decl_final.cc should remove these lines:
-48: 
-48: The full include-list for tests/cxx/fwd_decl_final.cc:
-48: #include "tests/cxx/fwd_decl_final.h"
-48: class FinalClass;
-48: template <typename T> class FinalTemplate;
-48: ---
-48: 
- 48/158 Test  #49: cxx.test_fwd_decl_nested_class ....................   Passed    1.06 sec
-test 51
-        Start  51: cxx.test_fwd_decl_static_member
-
-51: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_static_member.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-51: Working Directory: /build/iwyu-8.18
-51: Test timeout computed to be: 10000000
- 49/158 Test  #48: cxx.test_fwd_decl_final ...........................   Passed    1.14 sec
-test 52
-        Start  52: cxx.test_fwd_decl_then_dfn
-
-52: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_then_dfn.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-52: Working Directory: /build/iwyu-8.18
-52: Test timeout computed to be: 10000000
-52: INFO:root:Testing iwyu on tests/cxx/fwd_decl_then_dfn.cc
-50: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_decl_of_nested_class_defined_later.cc
-50: 
-50: (tests/cxx/fwd_decl_of_nested_class_defined_later.cc has correct #includes/fwd-decls)
-50: 
-51: INFO:root:Testing iwyu on tests/cxx/fwd_decl_static_member.cc
-52: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_decl_then_dfn.cc
-52: 
-52: (tests/cxx/fwd_decl_then_dfn.cc has correct #includes/fwd-decls)
-52: 
- 50/158 Test  #50: cxx.test_fwd_decl_of_nested_class_defined_later ...   Passed    1.52 sec
+ 49/158 Test  #49: cxx.test_fwd_decl_nested_class ....................   Passed    0.41 sec
 test 53
         Start  53: cxx.test_fwd_decl_with_attribute
 
 53: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_with_attribute.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 53: Working Directory: /build/iwyu-8.18
 53: Test timeout computed to be: 10000000
- 51/158 Test  #52: cxx.test_fwd_decl_then_dfn ........................   Passed    0.56 sec
-test 54
-        Start  54: cxx.test_fwd_decl_with_instantiation
-
-54: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_with_instantiation.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-54: Working Directory: /build/iwyu-8.18
-54: Test timeout computed to be: 10000000
+52: INFO:root:Testing iwyu on tests/cxx/fwd_decl_then_dfn.cc
 51: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/fwd_decl_static_member.cc
 51: 
 51: tests/cxx/fwd_decl_static_member.cc should add these lines:
@@ -3667,59 +3690,70 @@
 51: class IndirectClass;
 51: ---
 51: 
- 52/158 Test  #51: cxx.test_fwd_decl_static_member ...................   Passed    0.89 sec
+ 50/158 Test  #51: cxx.test_fwd_decl_static_member ...................   Passed    0.42 sec
+test 54
+        Start  54: cxx.test_fwd_decl_with_instantiation
+
+54: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_decl_with_instantiation.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+54: Working Directory: /build/iwyu-8.18
+54: Test timeout computed to be: 10000000
+52: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_decl_then_dfn.cc
+52: 
+52: (tests/cxx/fwd_decl_then_dfn.cc has correct #includes/fwd-decls)
+52: 
+50: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_decl_of_nested_class_defined_later.cc
+50: 
+50: (tests/cxx/fwd_decl_of_nested_class_defined_later.cc has correct #includes/fwd-decls)
+50: 
+ 51/158 Test  #52: cxx.test_fwd_decl_then_dfn ........................   Passed    0.47 sec
 test 55
         Start  55: cxx.test_fwd_declare_enum
 
 55: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/fwd_declare_enum.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 55: Working Directory: /build/iwyu-8.18
 55: Test timeout computed to be: 10000000
-53: INFO:root:Testing iwyu on tests/cxx/fwd_decl_with_attribute.cc
-54: INFO:root:Testing iwyu on tests/cxx/fwd_decl_with_instantiation.cc
-53: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_decl_with_attribute.cc
-53: 
-53: tests/cxx/fwd_decl_with_attribute.cc should add these lines:
-53: 
-53: tests/cxx/fwd_decl_with_attribute.cc should remove these lines:
-53: - struct InheritedAttrStruct;  // lines 18-18
-53: 
-53: The full include-list for tests/cxx/fwd_decl_with_attribute.cc:
-53: struct AttrStruct;  // lines 13-13
-53: ---
-53: 
-55: INFO:root:Testing iwyu on tests/cxx/fwd_declare_enum.cc
- 53/158 Test  #53: cxx.test_fwd_decl_with_attribute ..................   Passed    1.01 sec
+ 52/158 Test  #50: cxx.test_fwd_decl_of_nested_class_defined_later ...   Passed    0.72 sec
 test 56
         Start  56: cxx.test_header_in_subdir
 
 56: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/header_in_subdir.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 56: Working Directory: /build/iwyu-8.18
 56: Test timeout computed to be: 10000000
+54: INFO:root:Testing iwyu on tests/cxx/fwd_decl_with_instantiation.cc
+53: INFO:root:Testing iwyu on tests/cxx/fwd_decl_with_attribute.cc
 54: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/fwd_decl_with_instantiation.cc
 54: 
 54: (tests/cxx/fwd_decl_with_instantiation.h has correct #includes/fwd-decls)
 54: 
 54: (tests/cxx/fwd_decl_with_instantiation.cc has correct #includes/fwd-decls)
 54: 
- 54/158 Test  #54: cxx.test_fwd_decl_with_instantiation ..............   Passed    1.10 sec
+56: INFO:root:Testing iwyu on tests/cxx/header_in_subdir.cc
+53: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_decl_with_attribute.cc
+53: 
+53: tests/cxx/fwd_decl_with_attribute.cc should add these lines:
+53: 
+53: tests/cxx/fwd_decl_with_attribute.cc should remove these lines:
+53: - struct InheritedAttrStruct;  // lines 18-18
+53: 
+53: The full include-list for tests/cxx/fwd_decl_with_attribute.cc:
+53: struct AttrStruct;  // lines 13-13
+53: ---
+53: 
+ 53/158 Test  #54: cxx.test_fwd_decl_with_instantiation ..............   Passed    0.67 sec
 test 57
         Start  57: cxx.test_header_in_subdir_nopath
 
 57: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/header_in_subdir_nopath.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 57: Working Directory: /build/iwyu-8.18
 57: Test timeout computed to be: 10000000
-55: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_declare_enum.cc
-55: 
-55: (tests/cxx/fwd_declare_enum.cc has correct #includes/fwd-decls)
-55: 
- 55/158 Test  #55: cxx.test_fwd_declare_enum .........................   Passed    1.05 sec
+55: INFO:root:Testing iwyu on tests/cxx/fwd_declare_enum.cc
+ 54/158 Test  #53: cxx.test_fwd_decl_with_attribute ..................   Passed    0.81 sec
 test 58
         Start  58: cxx.test_header_near
 
 58: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/header_near.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 58: Working Directory: /build/iwyu-8.18
 58: Test timeout computed to be: 10000000
-56: INFO:root:Testing iwyu on tests/cxx/header_in_subdir.cc
 56: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/header_in_subdir.cc
 56: tests/cxx/header_in_subdir.cc:18:3: warning: IndirectSubDirClass is defined in "tests/cxx/subdir/indirect_subdir.h", which isn't directly #included.
 56: 
@@ -3733,7 +3767,12 @@
 56: #include "tests/cxx/subdir/indirect_subdir.h"  // for IndirectSubDirClass
 56: ---
 56: 
- 56/158 Test  #56: cxx.test_header_in_subdir .........................   Passed    0.84 sec
+57: INFO:root:Testing iwyu on tests/cxx/header_in_subdir_nopath.cc
+55: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/fwd_declare_enum.cc
+55: 
+55: (tests/cxx/fwd_declare_enum.cc has correct #includes/fwd-decls)
+55: 
+ 55/158 Test  #56: cxx.test_header_in_subdir .........................   Passed    0.64 sec
 test 59
         Start  59: cxx.test_implicit_ctor
 
@@ -3741,14 +3780,7 @@
 59: Working Directory: /build/iwyu-8.18
 59: Test timeout computed to be: 10000000
 58: INFO:root:Testing iwyu on tests/cxx/header_near.cc
-57: INFO:root:Testing iwyu on tests/cxx/header_in_subdir_nopath.cc
-58: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/header_near.cc
-58: 
-58: (tests/cxx/header_near.h has correct #includes/fwd-decls)
-58: 
-58: (tests/cxx/header_near.cc has correct #includes/fwd-decls)
-58: 
- 57/158 Test  #58: cxx.test_header_near ..............................   Passed    1.00 sec
+ 56/158 Test  #55: cxx.test_fwd_declare_enum .........................   Passed    0.66 sec
 test 60
         Start  60: cxx.test_include_cycle
 
@@ -3768,16 +3800,40 @@
 57: #include "subdir/indirect_subdir.h"  // for IndirectSubDirClass
 57: ---
 57: 
- 58/158 Test  #57: cxx.test_header_in_subdir_nopath ..................   Passed    1.36 sec
+ 57/158 Test  #57: cxx.test_header_in_subdir_nopath ..................   Passed    0.30 sec
 test 61
         Start  61: cxx.test_include_with_using
 
 61: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/include_with_using.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 61: Working Directory: /build/iwyu-8.18
 61: Test timeout computed to be: 10000000
-59: INFO:root:Testing iwyu on tests/cxx/implicit_ctor.cc
+58: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/header_near.cc
+58: 
+58: (tests/cxx/header_near.h has correct #includes/fwd-decls)
+58: 
+58: (tests/cxx/header_near.cc has correct #includes/fwd-decls)
+58: 
 60: INFO:root:Testing iwyu on tests/cxx/include_cycle.cc
+ 58/158 Test  #58: cxx.test_header_near ..............................   Passed    0.39 sec
+test 62
+        Start  62: cxx.test_inheriting_ctor
+
+62: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/inheriting_ctor.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+62: Working Directory: /build/iwyu-8.18
+62: Test timeout computed to be: 10000000
+59: INFO:root:Testing iwyu on tests/cxx/implicit_ctor.cc
 61: INFO:root:Testing iwyu on tests/cxx/include_with_using.cc
+60: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/include_cycle.cc
+60: 
+60: (tests/cxx/include_cycle.cc has correct #includes/fwd-decls)
+60: 
+ 59/158 Test  #60: cxx.test_include_cycle ............................   Passed    0.34 sec
+test 63
+        Start  63: cxx.test_inline_namespace
+
+63: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/inline_namespace.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+63: Working Directory: /build/iwyu-8.18
+63: Test timeout computed to be: 10000000
 59: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-d1.h" -I .  tests/cxx/implicit_ctor.cc
 59: tests/cxx/implicit_ctor-d1.h:18:20: warning: IndirectWithImplicitCtor is defined in "tests/cxx/implicit_ctor-i2.h", which isn't directly #included (for autocast).
 59: tests/cxx/implicit_ctor-d1.h:18:20: warning: IndirectWithImplicitCtor needs a declaration, but does not provide or directly #include one.
@@ -3808,24 +3864,14 @@
 59: #include "tests/cxx/implicit_ctor-i2.h"  // for IndirectWithImplicitCtor
 59: ---
 59: 
-60: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/include_cycle.cc
-60: 
-60: (tests/cxx/include_cycle.cc has correct #includes/fwd-decls)
-60: 
- 59/158 Test  #59: cxx.test_implicit_ctor ............................   Passed    1.50 sec
-test 62
-        Start  62: cxx.test_inheriting_ctor
-
-62: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/inheriting_ctor.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-62: Working Directory: /build/iwyu-8.18
-62: Test timeout computed to be: 10000000
- 60/158 Test  #60: cxx.test_include_cycle ............................   Passed    1.12 sec
-test 63
-        Start  63: cxx.test_inline_namespace
+62: INFO:root:Testing iwyu on tests/cxx/inheriting_ctor.cc
+ 60/158 Test  #59: cxx.test_implicit_ctor ............................   Passed    0.47 sec
+test 64
+        Start  64: cxx.test_integer_template_arg
 
-63: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/inline_namespace.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-63: Working Directory: /build/iwyu-8.18
-63: Test timeout computed to be: 10000000
+64: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/integer_template_arg.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+64: Working Directory: /build/iwyu-8.18
+64: Test timeout computed to be: 10000000
 61: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/include_with_using.cc
 61: tests/cxx/include_with_using.cc:50:3: warning: i1::UsingInCc is defined in "tests/cxx/include_with_using-i1.h", which isn't directly #included.
 61: 
@@ -3851,14 +3897,14 @@
 61: namespace ns5 { class PtrInNs5; }
 61: ---
 61: 
-62: INFO:root:Testing iwyu on tests/cxx/inheriting_ctor.cc
- 61/158 Test  #61: cxx.test_include_with_using .......................   Passed    1.22 sec
-test 64
-        Start  64: cxx.test_integer_template_arg
+ 61/158 Test  #61: cxx.test_include_with_using .......................   Passed    0.41 sec
+test 65
+        Start  65: cxx.test_internal_files
 
-64: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/integer_template_arg.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-64: Working Directory: /build/iwyu-8.18
-64: Test timeout computed to be: 10000000
+65: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/internal/internal_files.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+65: Working Directory: /build/iwyu-8.18
+65: Test timeout computed to be: 10000000
+63: INFO:root:Testing iwyu on tests/cxx/inline_namespace.cc
 62: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11  tests/cxx/inheriting_ctor.cc
 62: tests/cxx/inheriting_ctor.cc:15:15: warning: Derived is defined in "inheriting_ctor-i1.h", which isn't directly #included.
 62: 
@@ -3872,15 +3918,13 @@
 62: #include "inheriting_ctor-i1.h"  // for Derived
 62: ---
 62: 
-63: INFO:root:Testing iwyu on tests/cxx/inline_namespace.cc
- 62/158 Test  #62: cxx.test_inheriting_ctor ..........................   Passed    0.66 sec
-test 65
-        Start  65: cxx.test_internal_files
+ 62/158 Test  #62: cxx.test_inheriting_ctor ..........................   Passed    0.47 sec
+test 66
+        Start  66: cxx.test_iterator
 
-65: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/internal/internal_files.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-65: Working Directory: /build/iwyu-8.18
-65: Test timeout computed to be: 10000000
-64: INFO:root:Testing iwyu on tests/cxx/integer_template_arg.cc
+66: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/iterator.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+66: Working Directory: /build/iwyu-8.18
+66: Test timeout computed to be: 10000000
 63: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/inline_namespace.cc
 63: tests/cxx/inline_namespace.h:20:25: warning: xyz::Foo is defined in "tests/cxx/inline_namespace-i1.h", which isn't directly #included.
 63: 
@@ -3898,52 +3942,41 @@
 63: 
 63: (tests/cxx/inline_namespace.cc has correct #includes/fwd-decls)
 63: 
- 63/158 Test  #63: cxx.test_inline_namespace .........................   Passed    0.91 sec
-test 66
-        Start  66: cxx.test_iterator
-
-66: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/iterator.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-66: Working Directory: /build/iwyu-8.18
-66: Test timeout computed to be: 10000000
-65: INFO:root:Testing iwyu on tests/cxx/internal/internal_files.cc
-64: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/integer_template_arg.cc
-64: 
-64: (tests/cxx/integer_template_arg.cc has correct #includes/fwd-decls)
-64: 
- 64/158 Test  #64: cxx.test_integer_template_arg .....................   Passed    0.96 sec
+64: INFO:root:Testing iwyu on tests/cxx/integer_template_arg.cc
+ 63/158 Test  #63: cxx.test_inline_namespace .........................   Passed    0.42 sec
 test 67
         Start  67: cxx.test_iwyu_stricter_than_cpp
 
 67: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/iwyu_stricter_than_cpp.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 67: Working Directory: /build/iwyu-8.18
 67: Test timeout computed to be: 10000000
-65: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/internal/internal_files.cc
-65: 
-65: (tests/cxx/internal/internal_files.cc has correct #includes/fwd-decls)
-65: 
- 65/158 Test  #65: cxx.test_internal_files ...........................   Passed    0.98 sec
+65: INFO:root:Testing iwyu on tests/cxx/internal/internal_files.cc
+64: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/integer_template_arg.cc
+64: 
+64: (tests/cxx/integer_template_arg.cc has correct #includes/fwd-decls)
+64: 
+66: INFO:root:Testing iwyu on tests/cxx/iterator.cc
+ 64/158 Test  #64: cxx.test_integer_template_arg .....................   Passed    0.63 sec
 test 68
         Start  68: cxx.test_keep_mapping
 
 68: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/keep_mapping.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 68: Working Directory: /build/iwyu-8.18
 68: Test timeout computed to be: 10000000
-66: INFO:root:Testing iwyu on tests/cxx/iterator.cc
 67: INFO:root:Testing iwyu on tests/cxx/iwyu_stricter_than_cpp.cc
-68: INFO:root:Testing iwyu on tests/cxx/keep_mapping.cc
-68: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-public.h"  -Xiwyu --mapping_file=tests/cxx/keep_mapping.imp  -I .  tests/cxx/keep_mapping.cc
-68: 
-68: (tests/cxx/keep_mapping-public.h has correct #includes/fwd-decls)
-68: 
-68: (tests/cxx/keep_mapping.cc has correct #includes/fwd-decls)
-68: 
- 66/158 Test  #68: cxx.test_keep_mapping .............................   Passed    0.57 sec
+65: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/internal/internal_files.cc
+65: 
+65: (tests/cxx/internal/internal_files.cc has correct #includes/fwd-decls)
+65: 
+ 65/158 Test  #65: cxx.test_internal_files ...........................   Passed    0.71 sec
 test 69
         Start  69: cxx.test_keep_moc
 
 69: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/keep_moc.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 69: Working Directory: /build/iwyu-8.18
 69: Test timeout computed to be: 10000000
+68: INFO:root:Testing iwyu on tests/cxx/keep_mapping.cc
+69: INFO:root:Testing iwyu on tests/cxx/keep_moc.cc
 67: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-autocast.h"  -Xiwyu --check_also="tests/cxx/*-fnreturn.h"  -Xiwyu --check_also="tests/cxx/*-typedefs.h"  -Xiwyu --check_also="tests/cxx/*-type_alias.h"  -Xiwyu --check_also="tests/cxx/*-d2.h"  -I .  tests/cxx/iwyu_stricter_than_cpp.cc
 67: tests/cxx/iwyu_stricter_than_cpp-typedefs.h:22:9: warning: IndirectStruct1 is defined in "tests/cxx/iwyu_stricter_than_cpp-i1.h", which isn't directly #included.
 67: tests/cxx/iwyu_stricter_than_cpp-typedefs.h:26:9: warning: IndirectStructForwardDeclaredInD1 is defined in "tests/cxx/iwyu_stricter_than_cpp-i1.h", which isn't directly #included.
@@ -4096,14 +4129,26 @@
 67: template <typename T> struct TplIndirectStructForwardDeclaredInD1;
 67: ---
 67: 
- 67/158 Test  #67: cxx.test_iwyu_stricter_than_cpp ...................   Passed    1.08 sec
+68: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-public.h"  -Xiwyu --mapping_file=tests/cxx/keep_mapping.imp  -I .  tests/cxx/keep_mapping.cc
+68: 
+68: (tests/cxx/keep_mapping-public.h has correct #includes/fwd-decls)
+68: 
+68: (tests/cxx/keep_mapping.cc has correct #includes/fwd-decls)
+68: 
+ 66/158 Test  #67: cxx.test_iwyu_stricter_than_cpp ...................   Passed    0.74 sec
 test 70
         Start  70: cxx.test_lambda_fwd_decl
 
 70: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/lambda_fwd_decl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 70: Working Directory: /build/iwyu-8.18
 70: Test timeout computed to be: 10000000
-69: INFO:root:Testing iwyu on tests/cxx/keep_moc.cc
+ 67/158 Test  #68: cxx.test_keep_mapping .............................   Passed    0.42 sec
+test 71
+        Start  71: cxx.test_lateparsed_template
+
+71: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/lateparsed_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+71: Working Directory: /build/iwyu-8.18
+71: Test timeout computed to be: 10000000
 69: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-i1.h" -I .  tests/cxx/keep_moc.cc
 69: 
 69: (tests/cxx/keep_moc-i1.h has correct #includes/fwd-decls)
@@ -4120,26 +4165,20 @@
 69: #include "tests/cxx/keep_moc.moc"
 69: ---
 69: 
- 68/158 Test  #69: cxx.test_keep_moc .................................   Passed    0.83 sec
-test 71
-        Start  71: cxx.test_lateparsed_template
-
-71: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/lateparsed_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-71: Working Directory: /build/iwyu-8.18
-71: Test timeout computed to be: 10000000
-70: INFO:root:Testing iwyu on tests/cxx/lambda_fwd_decl.cc
-70: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11  tests/cxx/lambda_fwd_decl.cc
-70: 
-70: (tests/cxx/lambda_fwd_decl.cc has correct #includes/fwd-decls)
-70: 
-71: INFO:root:Testing iwyu on tests/cxx/lateparsed_template.cc
- 69/158 Test  #70: cxx.test_lambda_fwd_decl ..........................   Passed    1.01 sec
+ 68/158 Test  #69: cxx.test_keep_moc .................................   Passed    0.33 sec
 test 72
         Start  72: cxx.test_libbuiltins
 
 72: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/libbuiltins.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 72: Working Directory: /build/iwyu-8.18
 72: Test timeout computed to be: 10000000
+70: INFO:root:Testing iwyu on tests/cxx/lambda_fwd_decl.cc
+72: INFO:root:Testing iwyu on tests/cxx/libbuiltins.cc
+71: INFO:root:Testing iwyu on tests/cxx/lateparsed_template.cc
+70: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11  tests/cxx/lambda_fwd_decl.cc
+70: 
+70: (tests/cxx/lambda_fwd_decl.cc has correct #includes/fwd-decls)
+70: 
 71: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -fdelayed-template-parsing -I .  tests/cxx/lateparsed_template.cc
 71: tests/cxx/lateparsed_template.cc:29:3: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 71: tests/cxx/lateparsed_template.cc:36:5: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -4156,15 +4195,22 @@
 71: #include "tests/cxx/lateparsed_template-notchecked.h"  // for kUsableSymbol
 71: ---
 71: 
- 70/158 Test  #71: cxx.test_lateparsed_template ......................   Passed    0.66 sec
+ 69/158 Test  #70: cxx.test_lambda_fwd_decl ..........................   Passed    0.44 sec
 test 73
         Start  73: cxx.test_macro_defined_by_includer
 
 73: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/macro_defined_by_includer.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 73: Working Directory: /build/iwyu-8.18
 73: Test timeout computed to be: 10000000
-72: INFO:root:Testing iwyu on tests/cxx/libbuiltins.cc
+ 70/158 Test  #71: cxx.test_lateparsed_template ......................   Passed    0.53 sec
+test 74
+        Start  74: cxx.test_macro_location
+
+74: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/macro_location.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+74: Working Directory: /build/iwyu-8.18
+74: Test timeout computed to be: 10000000
 73: INFO:root:Testing iwyu on tests/cxx/macro_defined_by_includer.cc
+74: INFO:root:Testing iwyu on tests/cxx/macro_location.cc
 73: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11 -DCOMMAND_LINE_TYPE=double  -include tests/cxx/macro_defined_by_includer-prefix.h -I .  tests/cxx/macro_defined_by_includer.cc
 73: tests/cxx/macro_defined_by_includer.cc:25:1: warning: GuardedInclude1 is defined in "tests/cxx/macro_defined_by_includer-i1.h", which isn't directly #included.
 73: tests/cxx/macro_defined_by_includer.cc:53:3: warning: f is defined in "tests/cxx/macro_defined_by_includer-i3.h", which isn't directly #included.
@@ -4189,13 +4235,13 @@
 73: #include "tests/cxx/macro_defined_by_includer-xmacro.h"  // lines 48-48
 73: ---
 73: 
- 71/158 Test  #73: cxx.test_macro_defined_by_includer ................   Passed    1.12 sec
-test 74
-        Start  74: cxx.test_macro_location
+ 71/158 Test  #73: cxx.test_macro_defined_by_includer ................   Passed    0.67 sec
+test 75
+        Start  75: cxx.test_macro_location_tpl
 
-74: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/macro_location.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-74: Working Directory: /build/iwyu-8.18
-74: Test timeout computed to be: 10000000
+75: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/macro_location_tpl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+75: Working Directory: /build/iwyu-8.18
+75: Test timeout computed to be: 10000000
 72: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/libbuiltins.cc
 72: tests/cxx/libbuiltins.cc:20:10: warning: std::pow is defined in <cmath>, which isn't directly #included.
 72: 
@@ -4209,14 +4255,6 @@
 72: #include <cmath>  // for pow
 72: ---
 72: 
-74: INFO:root:Testing iwyu on tests/cxx/macro_location.cc
- 72/158 Test  #72: cxx.test_libbuiltins ..............................   Passed    2.00 sec
-test 75
-        Start  75: cxx.test_macro_location_tpl
-
-75: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/macro_location_tpl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-75: Working Directory: /build/iwyu-8.18
-75: Test timeout computed to be: 10000000
 74: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-d2.h" -Wno-sizeof-pointer-div  -I .  tests/cxx/macro_location.cc
 74: tests/cxx/macro_location.h:20:15: warning: Foo is defined in "tests/cxx/macro_location-i3.h", which isn't directly #included.
 74: tests/cxx/macro_location.h:36:1: warning: ConcatFwdDeclClass needs a declaration, but does not provide or directly #include one.
@@ -4246,7 +4284,7 @@
 74: 
 74: (tests/cxx/macro_location.cc has correct #includes/fwd-decls)
 74: 
- 73/158 Test  #74: cxx.test_macro_location ...........................   Passed    1.01 sec
+ 72/158 Test  #72: cxx.test_libbuiltins ..............................   Passed    1.21 sec
 test 76
         Start  76: cxx.test_macro_use_expanded_decl
 
@@ -4258,6 +4296,20 @@
 66: 
 66: (tests/cxx/iterator.cc has correct #includes/fwd-decls)
 66: 
+ 73/158 Test  #74: cxx.test_macro_location ...........................   Passed    0.76 sec
+test 77
+        Start  77: cxx.test_mapping_to_self
+
+77: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/mapping_to_self.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+77: Working Directory: /build/iwyu-8.18
+77: Test timeout computed to be: 10000000
+ 74/158 Test  #66: cxx.test_iterator .................................   Passed    2.17 sec
+test 78
+        Start  78: cxx.test_member_expr
+
+78: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/member_expr.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+78: Working Directory: /build/iwyu-8.18
+78: Test timeout computed to be: 10000000
 75: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/macro_location_tpl.cc
 75: tests/cxx/macro_location_tpl.cc:22:3: warning: FUNC_TEMPLATE_SPEC_EXPANSION is defined in "tests/cxx/macro_location_tpl-i1.h", which isn't directly #included.
 75: tests/cxx/macro_location_tpl.cc:25:3: warning: FUNC_TEMPLATE_SPEC_SPELLING is defined in "tests/cxx/macro_location_tpl-i1.h", which isn't directly #included.
@@ -4275,21 +4327,14 @@
 75: #include "tests/cxx/macro_location_tpl-i1.h"  // for CLASS_TEMPLATE_SPEC_EXPANSION, CLASS_TEMPLATE_SPEC_SPELLING, FUNC_TEMPLATE_SPEC_EXPANSION, FUNC_TEMPLATE_SPEC_SPELLING
 75: ---
 75: 
- 74/158 Test  #66: cxx.test_iterator .................................   Passed    4.96 sec
-test 77
-        Start  77: cxx.test_mapping_to_self
-
-77: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/mapping_to_self.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-77: Working Directory: /build/iwyu-8.18
-77: Test timeout computed to be: 10000000
- 75/158 Test  #75: cxx.test_macro_location_tpl .......................   Passed    0.72 sec
-test 78
-        Start  78: cxx.test_member_expr
-
-78: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/member_expr.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-78: Working Directory: /build/iwyu-8.18
-78: Test timeout computed to be: 10000000
 76: INFO:root:Testing iwyu on tests/cxx/macro_use_expanded_decl.cc
+ 75/158 Test  #75: cxx.test_macro_location_tpl .......................   Passed    0.36 sec
+test 79
+        Start  79: cxx.test_ms_inline_asm
+
+79: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/ms_inline_asm.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+79: Working Directory: /build/iwyu-8.18
+79: Test timeout computed to be: 10000000
 77: INFO:root:Testing iwyu on tests/cxx/mapping_to_self.cc
 78: INFO:root:Testing iwyu on tests/cxx/member_expr.cc
 76: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/macro_use_expanded_decl.cc
@@ -4306,26 +4351,27 @@
 76: #include "macro_use_expanded_decl-macro.h"  // for CALL_METHOD
 76: ---
 76: 
+ 76/158 Test  #76: cxx.test_macro_use_expanded_decl ..................   Passed    0.37 sec
+test 80
+        Start  80: cxx.test_multiple_include_paths
+
+80: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/multiple_include_paths.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+80: Working Directory: /build/iwyu-8.18
+80: Test timeout computed to be: 10000000
+79: INFO:root:Testing iwyu on tests/cxx/ms_inline_asm.cc
 77: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --mapping_file=tests/cxx/mapping_to_self.imp -I .  tests/cxx/mapping_to_self.cc
 77: 
 77: (tests/cxx/mapping_to_self.h has correct #includes/fwd-decls)
 77: 
 77: (tests/cxx/mapping_to_self.cc has correct #includes/fwd-decls)
 77: 
- 76/158 Test  #76: cxx.test_macro_use_expanded_decl ..................   Passed    1.21 sec
-test 79
-        Start  79: cxx.test_ms_inline_asm
-
-79: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/ms_inline_asm.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-79: Working Directory: /build/iwyu-8.18
-79: Test timeout computed to be: 10000000
- 77/158 Test  #77: cxx.test_mapping_to_self ..........................   Passed    1.11 sec
-test 80
-        Start  80: cxx.test_multiple_include_paths
+ 77/158 Test  #77: cxx.test_mapping_to_self ..........................   Passed    0.40 sec
+test 81
+        Start  81: cxx.test_new_header_path_local
 
-80: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/multiple_include_paths.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-80: Working Directory: /build/iwyu-8.18
-80: Test timeout computed to be: 10000000
+81: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/new_header_path_local.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+81: Working Directory: /build/iwyu-8.18
+81: Test timeout computed to be: 10000000
 78: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/member_expr.cc
 78: tests/cxx/member_expr.cc:18:17: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
 78: tests/cxx/member_expr.cc:20:6: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -4351,15 +4397,6 @@
 78: #include "tests/cxx/member_expr-d1.h"  // for CALL_METHOD, IC, IC_CALL_METHOD
 78: ---
 78: 
- 78/158 Test  #78: cxx.test_member_expr ..............................   Passed    1.13 sec
-test 81
-        Start  81: cxx.test_new_header_path_local
-
-81: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/new_header_path_local.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-81: Working Directory: /build/iwyu-8.18
-81: Test timeout computed to be: 10000000
-79: INFO:root:Testing iwyu on tests/cxx/ms_inline_asm.cc
-80: INFO:root:Testing iwyu on tests/cxx/multiple_include_paths.cc
 79: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -fms-extensions  tests/cxx/ms_inline_asm.cc
 79: tests/cxx/ms_inline_asm.cc:18:3: error: unsupported architecture 'armv7' for MS-style inline assembly
 79:   __asm {
@@ -4383,8 +4420,14 @@
 79: -(tests/cxx/ms_inline_asm.cc has correct #includes/fwd-decls)
 79: ---
 79: 
-81: INFO:root:Testing iwyu on tests/cxx/new_header_path_local.cc
- 79/158 Test  #79: cxx.test_ms_inline_asm ............................***Failed    0.82 sec
+ 78/158 Test  #78: cxx.test_member_expr ..............................   Passed    0.49 sec
+test 82
+        Start  82: cxx.test_new_header_path_provided
+
+82: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/new_header_path_provided.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+82: Working Directory: /build/iwyu-8.18
+82: Test timeout computed to be: 10000000
+ 79/158 Test  #79: cxx.test_ms_inline_asm ............................***Failed    0.40 sec
 INFO:root:Testing iwyu on tests/cxx/ms_inline_asm.cc
 >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -fms-extensions  tests/cxx/ms_inline_asm.cc
 tests/cxx/ms_inline_asm.cc:18:3: error: unsupported architecture 'armv7' for MS-style inline assembly
@@ -4410,12 +4453,15 @@
 ---
 
 
-test 82
-        Start  82: cxx.test_new_header_path_provided
+test 83
+        Start  83: cxx.test_no_char_traits
 
-82: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/new_header_path_provided.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-82: Working Directory: /build/iwyu-8.18
-82: Test timeout computed to be: 10000000
+83: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_char_traits.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+83: Working Directory: /build/iwyu-8.18
+83: Test timeout computed to be: 10000000
+80: INFO:root:Testing iwyu on tests/cxx/multiple_include_paths.cc
+81: INFO:root:Testing iwyu on tests/cxx/new_header_path_local.cc
+82: INFO:root:Testing iwyu on tests/cxx/new_header_path_provided.cc
 80: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/multiple_include_paths.cc
 80: 
 80: tests/cxx/multiple_include_paths.cc should add these lines:
@@ -4427,13 +4473,6 @@
 80: #include "tests/cxx/internal/../indirect.h"  // for IndirectClass
 80: ---
 80: 
- 80/158 Test  #80: cxx.test_multiple_include_paths ...................   Passed    1.04 sec
-test 83
-        Start  83: cxx.test_no_char_traits
-
-83: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_char_traits.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-83: Working Directory: /build/iwyu-8.18
-83: Test timeout computed to be: 10000000
 81: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/new_header_path_local.cc
 81: tests/cxx/new_header_path_local.cc:17:3: warning: IndirectClass is defined in "indirect.h", which isn't directly #included.
 81: 
@@ -4447,16 +4486,21 @@
 81: #include "indirect.h"  // for IndirectClass
 81: ---
 81: 
- 81/158 Test  #81: cxx.test_new_header_path_local ....................   Passed    1.04 sec
+83: INFO:root:Testing iwyu on tests/cxx/no_char_traits.cc
+ 80/158 Test  #80: cxx.test_multiple_include_paths ...................   Passed    0.63 sec
 test 84
         Start  84: cxx.test_no_comments
 
 84: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_comments.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 84: Working Directory: /build/iwyu-8.18
 84: Test timeout computed to be: 10000000
-82: INFO:root:Testing iwyu on tests/cxx/new_header_path_provided.cc
-83: INFO:root:Testing iwyu on tests/cxx/no_char_traits.cc
-84: INFO:root:Testing iwyu on tests/cxx/no_comments.cc
+ 81/158 Test  #81: cxx.test_new_header_path_local ....................   Passed    0.59 sec
+test 85
+        Start  85: cxx.test_no_definition
+
+85: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_definition.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+85: Working Directory: /build/iwyu-8.18
+85: Test timeout computed to be: 10000000
 82: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/new_header_path_provided.cc
 82: tests/cxx/new_header_path_provided.cc:19:3: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 82: 
@@ -4470,13 +4514,19 @@
 82: #include "tests/cxx/indirect.h"  // for IndirectClass
 82: ---
 82: 
- 82/158 Test  #82: cxx.test_new_header_path_provided .................   Passed    0.94 sec
-test 85
-        Start  85: cxx.test_no_definition
+ 82/158 Test  #82: cxx.test_new_header_path_provided .................   Passed    0.62 sec
+test 86
+        Start  86: cxx.test_no_deque
 
-85: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_definition.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-85: Working Directory: /build/iwyu-8.18
-85: Test timeout computed to be: 10000000
+86: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_deque.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+86: Working Directory: /build/iwyu-8.18
+86: Test timeout computed to be: 10000000
+84: INFO:root:Testing iwyu on tests/cxx/no_comments.cc
+85: INFO:root:Testing iwyu on tests/cxx/no_definition.cc
+85: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/no_definition.cc
+85: 
+85: (tests/cxx/no_definition.cc has correct #includes/fwd-decls)
+85: 
 84: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --no_comments -I .  tests/cxx/no_comments.cc
 84: tests/cxx/no_comments.cc:18:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 84: 
@@ -4490,82 +4540,48 @@
 84: #include "tests/cxx/indirect.h"
 84: ---
 84: 
- 83/158 Test  #84: cxx.test_no_comments ..............................   Passed    0.73 sec
-test 86
-        Start  86: cxx.test_no_deque
-
-86: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_deque.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-86: Working Directory: /build/iwyu-8.18
-86: Test timeout computed to be: 10000000
-85: INFO:root:Testing iwyu on tests/cxx/no_definition.cc
-85: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/no_definition.cc
-85: 
-85: (tests/cxx/no_definition.cc has correct #includes/fwd-decls)
-85: 
- 84/158 Test  #85: cxx.test_no_definition ............................   Passed    0.81 sec
+ 83/158 Test  #85: cxx.test_no_definition ............................   Passed    0.34 sec
 test 87
         Start  87: cxx.test_no_forced_alias_callability
 
 87: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_forced_alias_callability.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 87: Working Directory: /build/iwyu-8.18
 87: Test timeout computed to be: 10000000
-86: INFO:root:Testing iwyu on tests/cxx/no_deque.cc
-87: INFO:root:Testing iwyu on tests/cxx/no_forced_alias_callability.cc
-87: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/no_forced_alias_callability-d2.h"  -I .  tests/cxx/no_forced_alias_callability.cc
-87: 
-87: (tests/cxx/no_forced_alias_callability-d2.h has correct #includes/fwd-decls)
-87: 
-87: (tests/cxx/no_forced_alias_callability.cc has correct #includes/fwd-decls)
-87: 
- 85/158 Test  #87: cxx.test_no_forced_alias_callability ..............   Passed    0.92 sec
+ 84/158 Test  #84: cxx.test_no_comments ..............................   Passed    0.41 sec
 test 88
         Start  88: cxx.test_no_fwd_decl_nested_class
 
 88: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_fwd_decl_nested_class.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 88: Working Directory: /build/iwyu-8.18
 88: Test timeout computed to be: 10000000
+86: INFO:root:Testing iwyu on tests/cxx/no_deque.cc
+87: INFO:root:Testing iwyu on tests/cxx/no_forced_alias_callability.cc
 88: INFO:root:Testing iwyu on tests/cxx/no_fwd_decl_nested_class.cc
 88: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/no_fwd_decl_nested_class.cc
 88: 
 88: (tests/cxx/no_fwd_decl_nested_class.cc has correct #includes/fwd-decls)
 88: 
- 86/158 Test  #88: cxx.test_no_fwd_decl_nested_class .................   Passed    0.87 sec
+ 85/158 Test  #88: cxx.test_no_fwd_decl_nested_class .................   Passed    0.34 sec
 test 89
         Start  89: cxx.test_no_fwd_decl_std
 
 89: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_fwd_decl_std.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 89: Working Directory: /build/iwyu-8.18
 89: Test timeout computed to be: 10000000
-89: INFO:root:Testing iwyu on tests/cxx/no_fwd_decl_std.cc
-86: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/no_deque.cc
-86: 
-86: (tests/cxx/no_deque.cc has correct #includes/fwd-decls)
-86: 
- 87/158 Test  #86: cxx.test_no_deque .................................   Passed    3.48 sec
+87: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/no_forced_alias_callability-d2.h"  -I .  tests/cxx/no_forced_alias_callability.cc
+87: 
+87: (tests/cxx/no_forced_alias_callability-d2.h has correct #includes/fwd-decls)
+87: 
+87: (tests/cxx/no_forced_alias_callability.cc has correct #includes/fwd-decls)
+87: 
+ 86/158 Test  #87: cxx.test_no_forced_alias_callability ..............   Passed    0.46 sec
 test 90
         Start  90: cxx.test_no_fwd_decls
 
 90: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_fwd_decls.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 90: Working Directory: /build/iwyu-8.18
 90: Test timeout computed to be: 10000000
-89: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/no_fwd_decl_std.cc
-89: 
-89: tests/cxx/no_fwd_decl_std.cc should add these lines:
-89: 
-89: tests/cxx/no_fwd_decl_std.cc should remove these lines:
-89: - namespace std { template <typename T, typename U> struct pair; }  // lines 27-27
-89: 
-89: The full include-list for tests/cxx/no_fwd_decl_std.cc:
-89: #include <utility>  // for pair
-89: ---
-89: 
- 88/158 Test  #89: cxx.test_no_fwd_decl_std ..........................   Passed    1.55 sec
-test 91
-        Start  91: cxx.test_no_h_includes_cc
-
-91: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_h_includes_cc.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-91: Working Directory: /build/iwyu-8.18
-91: Test timeout computed to be: 10000000
+89: INFO:root:Testing iwyu on tests/cxx/no_fwd_decl_std.cc
 90: INFO:root:Testing iwyu on tests/cxx/no_fwd_decls.cc
 90: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --no_fwd_decls -I .  tests/cxx/no_fwd_decls.cc
 90: tests/cxx/no_fwd_decls.cc:27:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -4584,7 +4600,25 @@
 90: class LocalFwd;  // lines 31-31
 90: ---
 90: 
- 89/158 Test  #90: cxx.test_no_fwd_decls .............................   Passed    1.13 sec
+ 87/158 Test  #90: cxx.test_no_fwd_decls .............................   Passed    0.66 sec
+test 91
+        Start  91: cxx.test_no_h_includes_cc
+
+91: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/no_h_includes_cc.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+91: Working Directory: /build/iwyu-8.18
+91: Test timeout computed to be: 10000000
+89: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/no_fwd_decl_std.cc
+89: 
+89: tests/cxx/no_fwd_decl_std.cc should add these lines:
+89: 
+89: tests/cxx/no_fwd_decl_std.cc should remove these lines:
+89: - namespace std { template <typename T, typename U> struct pair; }  // lines 27-27
+89: 
+89: The full include-list for tests/cxx/no_fwd_decl_std.cc:
+89: #include <utility>  // for pair
+89: ---
+89: 
+ 88/158 Test  #89: cxx.test_no_fwd_decl_std ..........................   Passed    0.83 sec
 test 92
         Start  92: cxx.test_non_transitive_include
 
@@ -4592,6 +4626,7 @@
 92: Working Directory: /build/iwyu-8.18
 92: Test timeout computed to be: 10000000
 91: INFO:root:Testing iwyu on tests/cxx/no_h_includes_cc.cc
+92: INFO:root:Testing iwyu on tests/cxx/non_transitive_include.cc
 91: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*.c" -I .  tests/cxx/no_h_includes_cc.cc
 91: 
 91: (tests/cxx/no_h_includes_cc-inc.c has correct #includes/fwd-decls)
@@ -4602,14 +4637,6 @@
 91: 
 91: (tests/cxx/no_h_includes_cc.cc has correct #includes/fwd-decls)
 91: 
- 90/158 Test  #91: cxx.test_no_h_includes_cc .........................   Passed    0.95 sec
-test 93
-        Start  93: cxx.test_operator_new
-
-93: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/operator_new.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-93: Working Directory: /build/iwyu-8.18
-93: Test timeout computed to be: 10000000
-92: INFO:root:Testing iwyu on tests/cxx/non_transitive_include.cc
 92: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-d*.h"  -Xiwyu --transitive_includes_only  -I .  tests/cxx/non_transitive_include.cc
 92: 
 92: (tests/cxx/non_transitive_include-d1.h has correct #includes/fwd-decls)
@@ -4618,25 +4645,34 @@
 92: 
 92: (tests/cxx/non_transitive_include.cc has correct #includes/fwd-decls)
 92: 
-93: INFO:root:Testing iwyu on tests/cxx/operator_new.cc
- 91/158 Test  #92: cxx.test_non_transitive_include ...................   Passed    0.72 sec
+ 89/158 Test  #91: cxx.test_no_h_includes_cc .........................   Passed    0.39 sec
+test 93
+        Start  93: cxx.test_operator_new
+
+93: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/operator_new.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+93: Working Directory: /build/iwyu-8.18
+93: Test timeout computed to be: 10000000
+ 90/158 Test  #92: cxx.test_non_transitive_include ...................   Passed    0.36 sec
 test 94
         Start  94: cxx.test_out_of_line
 
 94: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/out_of_line.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 94: Working Directory: /build/iwyu-8.18
 94: Test timeout computed to be: 10000000
-83: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/no_char_traits.cc
-83: 
-83: (tests/cxx/no_char_traits.cc has correct #includes/fwd-decls)
-83: 
- 92/158 Test  #83: cxx.test_no_char_traits ...........................   Passed    6.75 sec
+86: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/no_deque.cc
+86: 
+86: (tests/cxx/no_deque.cc has correct #includes/fwd-decls)
+86: 
+ 91/158 Test  #86: cxx.test_no_deque .................................   Passed    1.82 sec
 test 95
         Start  95: cxx.test_overloaded_class
 
 95: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/overloaded_class.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 95: Working Directory: /build/iwyu-8.18
 95: Test timeout computed to be: 10000000
+94: INFO:root:Testing iwyu on tests/cxx/out_of_line.cc
+95: INFO:root:Testing iwyu on tests/cxx/overloaded_class.cc
+93: INFO:root:Testing iwyu on tests/cxx/operator_new.cc
 93: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++17 -I .  tests/cxx/operator_new.cc
 93: tests/cxx/operator_new.cc:23:26: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
 93: tests/cxx/operator_new.cc:23:3: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
@@ -4662,15 +4698,6 @@
 93: #include "tests/cxx/indirect.h"  // for IndirectClass
 93: ---
 93: 
- 93/158 Test  #93: cxx.test_operator_new .............................   Passed    1.11 sec
-test 96
-        Start  96: cxx.test_pch_in_code
-
-96: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/pch_in_code.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-96: Working Directory: /build/iwyu-8.18
-96: Test timeout computed to be: 10000000
-94: INFO:root:Testing iwyu on tests/cxx/out_of_line.cc
-96: INFO:root:Testing iwyu on tests/cxx/pch_in_code.cc
 94: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/out_of_line.cc
 94: tests/cxx/out_of_line.cc:36:3: warning: Dependent is defined in "out_of_line-dep-int.h", which isn't directly #included.
 94: tests/cxx/out_of_line.cc:45:5: warning: Dependent is defined in "out_of_line-dep-int.h", which isn't directly #included.
@@ -4688,14 +4715,33 @@
 94: #include "out_of_line-dep-int.h"  // for Dependent
 94: ---
 94: 
-95: INFO:root:Testing iwyu on tests/cxx/overloaded_class.cc
- 94/158 Test  #94: cxx.test_out_of_line ..............................   Passed    1.09 sec
+ 92/158 Test  #93: cxx.test_operator_new .............................   Passed    0.53 sec
+test 96
+        Start  96: cxx.test_pch_in_code
+
+96: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/pch_in_code.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+96: Working Directory: /build/iwyu-8.18
+96: Test timeout computed to be: 10000000
+ 93/158 Test  #94: cxx.test_out_of_line ..............................   Passed    0.54 sec
 test 97
         Start  97: cxx.test_placement_new
 
 97: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/placement_new.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 97: Working Directory: /build/iwyu-8.18
 97: Test timeout computed to be: 10000000
+96: INFO:root:Testing iwyu on tests/cxx/pch_in_code.cc
+83: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/no_char_traits.cc
+83: 
+83: (tests/cxx/no_char_traits.cc has correct #includes/fwd-decls)
+83: 
+97: INFO:root:Testing iwyu on tests/cxx/placement_new.cc
+ 94/158 Test  #83: cxx.test_no_char_traits ...........................   Passed    3.28 sec
+test 98
+        Start  98: cxx.test_pointer_arith
+
+98: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/pointer_arith.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+98: Working Directory: /build/iwyu-8.18
+98: Test timeout computed to be: 10000000
 96: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --pch_in_code -Xiwyu --prefix_header_includes=remove -I .  tests/cxx/pch_in_code.cc
 96: 
 96: (tests/cxx/public/pch_in_code.h has correct #includes/fwd-decls)
@@ -4712,14 +4758,6 @@
 96: #include <stdint.h>  // for int8_t
 96: ---
 96: 
- 95/158 Test  #96: cxx.test_pch_in_code ..............................   Passed    1.07 sec
-test 98
-        Start  98: cxx.test_pointer_arith
-
-98: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/pointer_arith.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-98: Working Directory: /build/iwyu-8.18
-98: Test timeout computed to be: 10000000
-97: INFO:root:Testing iwyu on tests/cxx/placement_new.cc
 97: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++17 -I .  tests/cxx/placement_new.cc
 97: tests/cxx/placement_new.cc:27:3: warning: operator new is defined in <new>, which isn't directly #included.
 97: tests/cxx/placement_new.cc:36:30: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -4781,13 +4819,20 @@
 97: ---
 97: 
 98: INFO:root:Testing iwyu on tests/cxx/pointer_arith.cc
- 96/158 Test  #97: cxx.test_placement_new ............................   Passed    1.26 sec
+ 95/158 Test  #96: cxx.test_pch_in_code ..............................   Passed    0.67 sec
 test 99
         Start  99: cxx.test_pragma_associated
 
 99: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/pragma_associated.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 99: Working Directory: /build/iwyu-8.18
 99: Test timeout computed to be: 10000000
+ 96/158 Test  #97: cxx.test_placement_new ............................   Passed    0.63 sec
+test 100
+        Start 100: cxx.test_precomputed_tpl_args
+
+100: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/precomputed_tpl_args.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+100: Working Directory: /build/iwyu-8.18
+100: Test timeout computed to be: 10000000
 98: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/pointer_arith.cc
 98: tests/cxx/pointer_arith.cc:18:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 98: tests/cxx/pointer_arith.cc:22:3: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
@@ -4808,42 +4853,15 @@
 98: #include "tests/cxx/indirect.h"  // for IndirectClass
 98: ---
 98: 
- 97/158 Test  #98: cxx.test_pointer_arith ............................   Passed    0.91 sec
-test 100
-        Start 100: cxx.test_precomputed_tpl_args
-
-100: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/precomputed_tpl_args.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-100: Working Directory: /build/iwyu-8.18
-100: Test timeout computed to be: 10000000
-99: INFO:root:Testing iwyu on tests/cxx/pragma_associated.cc
 100: INFO:root:Testing iwyu on tests/cxx/precomputed_tpl_args.cc
-99: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/pragma_associated.cc
-99: 
-99: (tests/cxx/pragma_associated-d1.h has correct #includes/fwd-decls)
-99: 
-99: (tests/cxx/pragma_associated-d2.h has correct #includes/fwd-decls)
-99: 
-99: (tests/cxx/pragma_associated.h has correct #includes/fwd-decls)
-99: 
-99: tests/cxx/pragma_associated.cc should add these lines:
-99: 
-99: tests/cxx/pragma_associated.cc should remove these lines:
-99: - #include "tests/cxx/direct.h"  // lines 15-15
-99: 
-99: The full include-list for tests/cxx/pragma_associated.cc:
-99: #include "tests/cxx/pragma_associated-d1.h"
-99: #include "tests/cxx/pragma_associated-d2.h"
-99: #include "tests/cxx/pragma_associated.h"
-99: ---
-99: 
- 98/158 Test  #99: cxx.test_pragma_associated ........................   Passed    1.10 sec
+ 97/158 Test  #98: cxx.test_pointer_arith ............................   Passed    0.41 sec
 test 101
         Start 101: cxx.test_prefix_header_attribution
 
 101: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/prefix_header_attribution.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 101: Working Directory: /build/iwyu-8.18
 101: Test timeout computed to be: 10000000
-101: INFO:root:Testing iwyu on tests/cxx/prefix_header_attribution.cc
+99: INFO:root:Testing iwyu on tests/cxx/pragma_associated.cc
 95: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --check_also="tests/cxx/*-i1.h" -I .  tests/cxx/overloaded_class.cc
 95: 
 95: (tests/cxx/overloaded_class-i1.h has correct #includes/fwd-decls)
@@ -4859,27 +4877,55 @@
 95: #include "tests/cxx/overloaded_class-i1.h"  // for MyFunc
 95: ---
 95: 
- 99/158 Test  #95: cxx.test_overloaded_class .........................   Passed    3.55 sec
+ 98/158 Test  #95: cxx.test_overloaded_class .........................   Passed    1.52 sec
 test 102
         Start 102: cxx.test_prefix_header_includes_add
 
 102: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/prefix_header_includes_add.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 102: Working Directory: /build/iwyu-8.18
 102: Test timeout computed to be: 10000000
-101: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --prefix_header_includes=remove  -include tests/cxx/prefix_header_attribution-d1.h -I .  tests/cxx/prefix_header_attribution.cc
-101: tests/cxx/prefix_header_attribution.cc:26:1: warning: MACRO_IN_PREFIX_HEADER is defined in "tests/cxx/prefix_header_attribution-i1.h", which isn't directly #included.
-101: tests/cxx/prefix_header_attribution.cc:31:3: warning: operator new is defined in <new>, which isn't directly #included.
-101: 
-101: (tests/cxx/prefix_header_attribution.cc has correct #includes/fwd-decls)
-101: 
-100/158 Test #101: cxx.test_prefix_header_attribution ................   Passed    0.97 sec
+101: INFO:root:Testing iwyu on tests/cxx/prefix_header_attribution.cc
+99: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/pragma_associated.cc
+99: 
+99: (tests/cxx/pragma_associated-d1.h has correct #includes/fwd-decls)
+99: 
+99: (tests/cxx/pragma_associated-d2.h has correct #includes/fwd-decls)
+99: 
+99: (tests/cxx/pragma_associated.h has correct #includes/fwd-decls)
+99: 
+99: tests/cxx/pragma_associated.cc should add these lines:
+99: 
+99: tests/cxx/pragma_associated.cc should remove these lines:
+99: - #include "tests/cxx/direct.h"  // lines 15-15
+99: 
+99: The full include-list for tests/cxx/pragma_associated.cc:
+99: #include "tests/cxx/pragma_associated-d1.h"
+99: #include "tests/cxx/pragma_associated-d2.h"
+99: #include "tests/cxx/pragma_associated.h"
+99: ---
+99: 
+ 99/158 Test  #99: cxx.test_pragma_associated ........................   Passed    0.63 sec
 test 103
         Start 103: cxx.test_prefix_header_includes_keep
 
 103: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/prefix_header_includes_keep.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 103: Working Directory: /build/iwyu-8.18
 103: Test timeout computed to be: 10000000
+101: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --prefix_header_includes=remove  -include tests/cxx/prefix_header_attribution-d1.h -I .  tests/cxx/prefix_header_attribution.cc
+101: tests/cxx/prefix_header_attribution.cc:26:1: warning: MACRO_IN_PREFIX_HEADER is defined in "tests/cxx/prefix_header_attribution-i1.h", which isn't directly #included.
+101: tests/cxx/prefix_header_attribution.cc:31:3: warning: operator new is defined in <new>, which isn't directly #included.
+101: 
+101: (tests/cxx/prefix_header_attribution.cc has correct #includes/fwd-decls)
+101: 
 102: INFO:root:Testing iwyu on tests/cxx/prefix_header_includes_add.cc
+100/158 Test #101: cxx.test_prefix_header_attribution ................   Passed    0.64 sec
+test 104
+        Start 104: cxx.test_prefix_header_includes_remove
+
+104: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/prefix_header_includes_remove.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+104: Working Directory: /build/iwyu-8.18
+104: Test timeout computed to be: 10000000
+103: INFO:root:Testing iwyu on tests/cxx/prefix_header_includes_keep.cc
 102: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --prefix_header_includes=add  -include tests/cxx/prefix_header_includes-d1.h  -include tests/cxx/prefix_header_includes-d2.h  -include tests/cxx/prefix_header_includes-d3.h  -include tests/cxx/prefix_header_includes-d4.h  -I .  tests/cxx/prefix_header_includes_add.cc
 102: tests/cxx/prefix_header_includes_add.cc:27:1: warning: CommandLineIncludeD2 is defined in "tests/cxx/prefix_header_includes-d2.h", which isn't directly #included.
 102: tests/cxx/prefix_header_includes_add.cc:34:1: warning: CommandLineIncludeD4 needs a declaration, but does not provide or directly #include one.
@@ -4904,14 +4950,14 @@
 102: class CommandLineIncludeD4;
 102: ---
 102: 
-103: INFO:root:Testing iwyu on tests/cxx/prefix_header_includes_keep.cc
-101/158 Test #102: cxx.test_prefix_header_includes_add ...............   Passed    0.99 sec
-test 104
-        Start 104: cxx.test_prefix_header_includes_remove
+101/158 Test #102: cxx.test_prefix_header_includes_add ...............   Passed    0.61 sec
+test 105
+        Start 105: cxx.test_prefix_header_operator_new
 
-104: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/prefix_header_includes_remove.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-104: Working Directory: /build/iwyu-8.18
-104: Test timeout computed to be: 10000000
+105: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/prefix_header_operator_new.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+105: Working Directory: /build/iwyu-8.18
+105: Test timeout computed to be: 10000000
+104: INFO:root:Testing iwyu on tests/cxx/prefix_header_includes_remove.cc
 103: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --prefix_header_includes=keep  -include tests/cxx/prefix_header_includes-d1.h  -include tests/cxx/prefix_header_includes-d2.h  -include tests/cxx/prefix_header_includes-d3.h  -include tests/cxx/prefix_header_includes-d4.h  -I .  tests/cxx/prefix_header_includes_keep.cc
 103: tests/cxx/prefix_header_includes_keep.cc:27:1: warning: CommandLineIncludeD2 is defined in "tests/cxx/prefix_header_includes-d2.h", which isn't directly #included.
 103: tests/cxx/prefix_header_includes_keep.cc:34:1: warning: CommandLineIncludeD4 needs a declaration, but does not provide or directly #include one.
@@ -4930,14 +4976,14 @@
 103: class CommandLineIncludeD3;  // lines 30-30
 103: ---
 103: 
-102/158 Test #103: cxx.test_prefix_header_includes_keep ..............   Passed    0.93 sec
-test 105
-        Start 105: cxx.test_prefix_header_operator_new
+102/158 Test #103: cxx.test_prefix_header_includes_keep ..............   Passed    0.51 sec
+test 106
+        Start 106: cxx.test_quoted_includes_first
 
-105: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/prefix_header_operator_new.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-105: Working Directory: /build/iwyu-8.18
-105: Test timeout computed to be: 10000000
-104: INFO:root:Testing iwyu on tests/cxx/prefix_header_includes_remove.cc
+106: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/quoted_includes_first.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+106: Working Directory: /build/iwyu-8.18
+106: Test timeout computed to be: 10000000
+105: INFO:root:Testing iwyu on tests/cxx/prefix_header_operator_new.cc
 104: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --prefix_header_includes=remove  -include tests/cxx/prefix_header_includes-d1.h  -include tests/cxx/prefix_header_includes-d2.h  -include tests/cxx/prefix_header_includes-d3.h  -include tests/cxx/prefix_header_includes-d4.h  -I .  tests/cxx/prefix_header_includes_remove.cc
 104: tests/cxx/prefix_header_includes_remove.cc:27:1: warning: CommandLineIncludeD2 is defined in "tests/cxx/prefix_header_includes-d2.h", which isn't directly #included.
 104: tests/cxx/prefix_header_includes_remove.cc:34:1: warning: CommandLineIncludeD4 needs a declaration, but does not provide or directly #include one.
@@ -4956,14 +5002,13 @@
 104: #include "tests/cxx/indirect.h"  // for IndirectClass
 104: ---
 104: 
-103/158 Test #104: cxx.test_prefix_header_includes_remove ............   Passed    1.01 sec
-test 106
-        Start 106: cxx.test_quoted_includes_first
+103/158 Test #104: cxx.test_prefix_header_includes_remove ............   Passed    0.45 sec
+test 107
+        Start 107: cxx.test_range_for
 
-106: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/quoted_includes_first.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-106: Working Directory: /build/iwyu-8.18
-106: Test timeout computed to be: 10000000
-105: INFO:root:Testing iwyu on tests/cxx/prefix_header_operator_new.cc
+107: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/range_for.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+107: Working Directory: /build/iwyu-8.18
+107: Test timeout computed to be: 10000000
 105: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --prefix_header_includes=remove  tests/cxx/prefix_header_operator_new.cc
 105: tests/cxx/prefix_header_operator_new.cc:19:3: warning: operator new is defined in <new>, which isn't directly #included.
 105: 
@@ -4976,15 +5021,16 @@
 105: #include <new>  // for operator new
 105: ---
 105: 
-104/158 Test #105: cxx.test_prefix_header_operator_new ...............   Passed    1.08 sec
-test 107
-        Start 107: cxx.test_range_for
-
-107: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/range_for.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-107: Working Directory: /build/iwyu-8.18
-107: Test timeout computed to be: 10000000
 106: INFO:root:Testing iwyu on tests/cxx/quoted_includes_first.cc
+104/158 Test #105: cxx.test_prefix_header_operator_new ...............   Passed    0.30 sec
+test 108
+        Start 108: cxx.test_re_fwd_decl
+
+108: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/re_fwd_decl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+108: Working Directory: /build/iwyu-8.18
+108: Test timeout computed to be: 10000000
 107: INFO:root:Testing iwyu on tests/cxx/range_for.cc
+108: INFO:root:Testing iwyu on tests/cxx/re_fwd_decl.cc
 107: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11 -I .  tests/cxx/range_for.cc
 107: tests/cxx/range_for.cc:22:14: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
 107: tests/cxx/range_for.cc:29:8: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -5000,14 +5046,13 @@
 107: #include "tests/cxx/range_for-iterable.h"  // for Iterable
 107: ---
 107: 
-105/158 Test #107: cxx.test_range_for ................................   Passed    1.13 sec
-test 108
-        Start 108: cxx.test_re_fwd_decl
+105/158 Test #107: cxx.test_range_for ................................   Passed    0.45 sec
+test 109
+        Start 109: cxx.test_redecls
 
-108: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/re_fwd_decl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-108: Working Directory: /build/iwyu-8.18
-108: Test timeout computed to be: 10000000
-108: INFO:root:Testing iwyu on tests/cxx/re_fwd_decl.cc
+109: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/redecls.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+109: Working Directory: /build/iwyu-8.18
+109: Test timeout computed to be: 10000000
 108: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/re_fwd_decl.cc
 108: 
 108: (tests/cxx/re_fwd_decl.h has correct #includes/fwd-decls)
@@ -5024,14 +5069,15 @@
 108: class Indirect;
 108: ---
 108: 
-106/158 Test #108: cxx.test_re_fwd_decl ..............................   Passed    0.83 sec
-test 109
-        Start 109: cxx.test_redecls
+106/158 Test #108: cxx.test_re_fwd_decl ..............................   Passed    0.49 sec
+test 110
+        Start 110: cxx.test_relative_exported_mapped_include
 
-109: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/redecls.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-109: Working Directory: /build/iwyu-8.18
-109: Test timeout computed to be: 10000000
+110: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/relative_exported_mapped_include.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+110: Working Directory: /build/iwyu-8.18
+110: Test timeout computed to be: 10000000
 109: INFO:root:Testing iwyu on tests/cxx/redecls.cc
+110: INFO:root:Testing iwyu on tests/cxx/relative_exported_mapped_include.cc
 109: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/redecls.cc
 109: 
 109: tests/cxx/redecls.h should add these lines:
@@ -5053,14 +5099,70 @@
 109: #include "tests/cxx/redecls.h"
 109: ---
 109: 
-107/158 Test #109: cxx.test_redecls ..................................   Passed    0.94 sec
-test 110
-        Start 110: cxx.test_relative_exported_mapped_include
+107/158 Test #109: cxx.test_redecls ..................................   Passed    0.54 sec
+test 111
+        Start 111: cxx.test_relative_include_of_double_export
 
-110: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/relative_exported_mapped_include.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-110: Working Directory: /build/iwyu-8.18
-110: Test timeout computed to be: 10000000
-110: INFO:root:Testing iwyu on tests/cxx/relative_exported_mapped_include.cc
+111: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/relative_include_of_double_export.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+111: Working Directory: /build/iwyu-8.18
+111: Test timeout computed to be: 10000000
+110: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu  --mapping_file=tests/cxx/relative_exported_mapped_include.imp  -I tests/cxx/subdir  tests/cxx/relative_exported_mapped_include.cc
+110: 
+110: (tests/cxx/relative_exported_mapped_include.cc has correct #includes/fwd-decls)
+110: 
+108/158 Test #110: cxx.test_relative_exported_mapped_include .........   Passed    0.57 sec
+test 112
+        Start 112: cxx.test_relative_include_of_export
+
+112: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/relative_include_of_export.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+112: Working Directory: /build/iwyu-8.18
+112: Test timeout computed to be: 10000000
+111: INFO:root:Testing iwyu on tests/cxx/relative_include_of_double_export.cc
+112: INFO:root:Testing iwyu on tests/cxx/relative_include_of_export.cc
+111: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/relative_include_of_double_export.cc
+111: 
+111: (tests/cxx/relative_include_of_double_export.cc has correct #includes/fwd-decls)
+111: 
+109/158 Test #111: cxx.test_relative_include_of_double_export ........   Passed    0.37 sec
+test 113
+        Start 113: cxx.test_relative_include_of_export_added
+
+113: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/relative_include_of_export_added.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+113: Working Directory: /build/iwyu-8.18
+113: Test timeout computed to be: 10000000
+112: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/relative_include_of_export.cc
+112: 
+112: (tests/cxx/relative_include_of_export.cc has correct #includes/fwd-decls)
+112: 
+110/158 Test #112: cxx.test_relative_include_of_export ...............   Passed    0.40 sec
+test 114
+        Start 114: cxx.test_remove_fwd_decl_when_including
+
+114: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/remove_fwd_decl_when_including.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+114: Working Directory: /build/iwyu-8.18
+114: Test timeout computed to be: 10000000
+113: INFO:root:Testing iwyu on tests/cxx/relative_include_of_export_added.cc
+113: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/relative_include_of_export_added.cc
+113: tests/cxx/relative_include_of_export_added.cc:16:1: warning: PrivateClass is defined in "export_private_near.h", which isn't directly #included.
+113: 
+113: tests/cxx/relative_include_of_export_added.cc should add these lines:
+113: #include "export_private_near.h"  // for PrivateClass
+113: 
+113: tests/cxx/relative_include_of_export_added.cc should remove these lines:
+113: - #include "relative_include_of_export_added-d1.h"  // lines 13-13
+113: 
+113: The full include-list for tests/cxx/relative_include_of_export_added.cc:
+113: #include "export_private_near.h"  // for PrivateClass
+113: ---
+113: 
+114: INFO:root:Testing iwyu on tests/cxx/remove_fwd_decl_when_including.cc
+111/158 Test #113: cxx.test_relative_include_of_export_added .........   Passed    0.51 sec
+test 115
+        Start 115: cxx.test_scope_crash
+
+115: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/scope_crash.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+115: Working Directory: /build/iwyu-8.18
+115: Test timeout computed to be: 10000000
 100: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/precomputed_tpl_args.cc
 100: tests/cxx/precomputed_tpl_args.cc:26:13: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
 100: tests/cxx/precomputed_tpl_args.cc:26:28: warning: IndirectClass is defined in "tests/cxx/precomputed_tpl_args-i1.h", which isn't directly #included.
@@ -5102,50 +5204,6 @@
 100: #include "tests/cxx/precomputed_tpl_args-i1.h"  // for IndirectClass, SpecializationClass, less
 100: ---
 100: 
-108/158 Test #100: cxx.test_precomputed_tpl_args .....................   Passed    7.57 sec
-test 111
-        Start 111: cxx.test_relative_include_of_double_export
-
-111: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/relative_include_of_double_export.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-111: Working Directory: /build/iwyu-8.18
-111: Test timeout computed to be: 10000000
-110: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu  --mapping_file=tests/cxx/relative_exported_mapped_include.imp  -I tests/cxx/subdir  tests/cxx/relative_exported_mapped_include.cc
-110: 
-110: (tests/cxx/relative_exported_mapped_include.cc has correct #includes/fwd-decls)
-110: 
-109/158 Test #110: cxx.test_relative_exported_mapped_include .........   Passed    1.05 sec
-test 112
-        Start 112: cxx.test_relative_include_of_export
-
-112: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/relative_include_of_export.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-112: Working Directory: /build/iwyu-8.18
-112: Test timeout computed to be: 10000000
-111: INFO:root:Testing iwyu on tests/cxx/relative_include_of_double_export.cc
-112: INFO:root:Testing iwyu on tests/cxx/relative_include_of_export.cc
-111: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/relative_include_of_double_export.cc
-111: 
-111: (tests/cxx/relative_include_of_double_export.cc has correct #includes/fwd-decls)
-111: 
-112: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/relative_include_of_export.cc
-112: 
-112: (tests/cxx/relative_include_of_export.cc has correct #includes/fwd-decls)
-112: 
-110/158 Test #111: cxx.test_relative_include_of_double_export ........   Passed    0.97 sec
-test 113
-        Start 113: cxx.test_relative_include_of_export_added
-
-113: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/relative_include_of_export_added.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-113: Working Directory: /build/iwyu-8.18
-113: Test timeout computed to be: 10000000
-111/158 Test #112: cxx.test_relative_include_of_export ...............   Passed    0.85 sec
-test 114
-        Start 114: cxx.test_remove_fwd_decl_when_including
-
-114: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/remove_fwd_decl_when_including.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-114: Working Directory: /build/iwyu-8.18
-114: Test timeout computed to be: 10000000
-113: INFO:root:Testing iwyu on tests/cxx/relative_include_of_export_added.cc
-114: INFO:root:Testing iwyu on tests/cxx/remove_fwd_decl_when_including.cc
 114: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/remove_fwd_decl_when_including.cc
 114: tests/cxx/remove_fwd_decl_when_including.cc:28:3: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 114: 
@@ -5160,27 +5218,7 @@
 114: #include "tests/cxx/indirect.h"  // for IndirectClass
 114: ---
 114: 
-113: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/relative_include_of_export_added.cc
-113: tests/cxx/relative_include_of_export_added.cc:16:1: warning: PrivateClass is defined in "export_private_near.h", which isn't directly #included.
-113: 
-113: tests/cxx/relative_include_of_export_added.cc should add these lines:
-113: #include "export_private_near.h"  // for PrivateClass
-113: 
-113: tests/cxx/relative_include_of_export_added.cc should remove these lines:
-113: - #include "relative_include_of_export_added-d1.h"  // lines 13-13
-113: 
-113: The full include-list for tests/cxx/relative_include_of_export_added.cc:
-113: #include "export_private_near.h"  // for PrivateClass
-113: ---
-113: 
-112/158 Test #114: cxx.test_remove_fwd_decl_when_including ...........   Passed    0.82 sec
-test 115
-        Start 115: cxx.test_scope_crash
-
-115: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/scope_crash.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-115: Working Directory: /build/iwyu-8.18
-115: Test timeout computed to be: 10000000
-113/158 Test #113: cxx.test_relative_include_of_export_added .........   Passed    0.99 sec
+112/158 Test #100: cxx.test_precomputed_tpl_args .....................   Passed    3.48 sec
 test 116
         Start 116: cxx.test_self_include
 
@@ -5188,19 +5226,26 @@
 116: Working Directory: /build/iwyu-8.18
 116: Test timeout computed to be: 10000000
 115: INFO:root:Testing iwyu on tests/cxx/scope_crash.cc
-116: INFO:root:Testing iwyu on tests/cxx/self_include.cc
-116: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/self_include.cc
-116: 
-116: (tests/cxx/self_include.cc has correct #includes/fwd-decls)
-116: 
-114/158 Test #116: cxx.test_self_include .............................   Passed    1.12 sec
+113/158 Test #114: cxx.test_remove_fwd_decl_when_including ...........   Passed    0.72 sec
 test 117
         Start 117: cxx.test_sizeof_in_template_arg
 
 117: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/sizeof_in_template_arg.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 117: Working Directory: /build/iwyu-8.18
 117: Test timeout computed to be: 10000000
+116: INFO:root:Testing iwyu on tests/cxx/self_include.cc
 117: INFO:root:Testing iwyu on tests/cxx/sizeof_in_template_arg.cc
+116: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/self_include.cc
+116: 
+116: (tests/cxx/self_include.cc has correct #includes/fwd-decls)
+116: 
+114/158 Test #116: cxx.test_self_include .............................   Passed    0.29 sec
+test 118
+        Start 118: cxx.test_sizeof_reference
+
+118: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/sizeof_reference.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+118: Working Directory: /build/iwyu-8.18
+118: Test timeout computed to be: 10000000
 117: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/sizeof_in_template_arg.cc
 117: tests/cxx/sizeof_in_template_arg.cc:30:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 117: tests/cxx/sizeof_in_template_arg.cc:30:23: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -5216,14 +5261,15 @@
 117: #include "tests/cxx/indirect.h"  // for IndirectClass
 117: ---
 117: 
-115/158 Test #117: cxx.test_sizeof_in_template_arg ...................   Passed    0.87 sec
-test 118
-        Start 118: cxx.test_sizeof_reference
+115/158 Test #117: cxx.test_sizeof_in_template_arg ...................   Passed    0.32 sec
+test 119
+        Start 119: cxx.test_specialization_needs_decl
 
-118: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/sizeof_reference.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-118: Working Directory: /build/iwyu-8.18
-118: Test timeout computed to be: 10000000
+119: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/specialization_needs_decl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+119: Working Directory: /build/iwyu-8.18
+119: Test timeout computed to be: 10000000
 118: INFO:root:Testing iwyu on tests/cxx/sizeof_reference.cc
+119: INFO:root:Testing iwyu on tests/cxx/specialization_needs_decl.cc
 118: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/sizeof_reference.cc
 118: tests/cxx/sizeof_reference.cc:44:19: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 118: tests/cxx/sizeof_reference.cc:44:19: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
@@ -5260,52 +5306,13 @@
 118: #include "tests/cxx/indirect.h"  // for IndirectClass
 118: ---
 118: 
-116/158 Test #118: cxx.test_sizeof_reference .........................   Passed    0.90 sec
-test 119
-        Start 119: cxx.test_specialization_needs_decl
-
-119: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/specialization_needs_decl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-119: Working Directory: /build/iwyu-8.18
-119: Test timeout computed to be: 10000000
-106: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --pch_in_code -Xiwyu --quoted_includes_first -I .  tests/cxx/quoted_includes_first.cc
-106: 
-106: tests/cxx/quoted_includes_first.h should add these lines:
-106: class IndirectSubDirClass;
-106: 
-106: tests/cxx/quoted_includes_first.h should remove these lines:
-106: - #include "subdir/indirect_subdir.h"  // lines 14-14
-106: - #include <iostream>  // lines 10-10
-106: - #include <list>  // lines 11-11
-106: - #include <map>  // lines 12-12
-106: 
-106: The full include-list for tests/cxx/quoted_includes_first.h:
-106: #include <memory>  // for unique_ptr
-106: class IndirectSubDirClass;
-106: ---
-106: 
-106: tests/cxx/quoted_includes_first.cc should add these lines:
-106: 
-106: tests/cxx/quoted_includes_first.cc should remove these lines:
-106: - #include <iostream>  // lines 15-15
-106: - #include <list>  // lines 16-16
-106: - #include <map>  // lines 17-17
-106: 
-106: The full include-list for tests/cxx/quoted_includes_first.cc:
-106: #include "tests/cxx/pch.h"
-106: #include "quoted_includes_first.h"
-106: #include "subdir/indirect_subdir.h"  // for IndirectSubDirClass
-106: #include <memory>                    // for unique_ptr
-106: ---
-106: 
-117/158 Test #106: cxx.test_quoted_includes_first ....................   Passed    9.22 sec
+116/158 Test #118: cxx.test_sizeof_reference .........................   Passed    0.39 sec
 test 120
         Start 120: cxx.test_std_size_t
 
 120: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/std_size_t.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 120: Working Directory: /build/iwyu-8.18
 120: Test timeout computed to be: 10000000
-119: INFO:root:Testing iwyu on tests/cxx/specialization_needs_decl.cc
-120: INFO:root:Testing iwyu on tests/cxx/std_size_t.cc
 119: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/specialization_needs_decl.cc
 119: tests/cxx/specialization_needs_decl.cc:28:7: warning: Template needs a declaration, but does not provide or directly #include one.
 119: tests/cxx/specialization_needs_decl.cc:30:12: warning: Template is defined in "tests/cxx/specialization_needs_decl-i1.h", which isn't directly #included.
@@ -5322,13 +5329,14 @@
 119: template <typename T> struct TplStruct;
 119: ---
 119: 
-118/158 Test #119: cxx.test_specialization_needs_decl ................   Passed    0.66 sec
+117/158 Test #119: cxx.test_specialization_needs_decl ................   Passed    0.51 sec
 test 121
         Start 121: cxx.test_stl_container_provides_allocator
 
 121: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/stl_container_provides_allocator.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 121: Working Directory: /build/iwyu-8.18
 121: Test timeout computed to be: 10000000
+120: INFO:root:Testing iwyu on tests/cxx/std_size_t.cc
 121: INFO:root:Testing iwyu on tests/cxx/stl_container_provides_allocator.cc
 120: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/std_size_t.cc
 120: 
@@ -5341,7 +5349,7 @@
 120: #include <cstdio>  // for printf, size_t
 120: ---
 120: 
-119/158 Test #120: cxx.test_std_size_t ...............................   Passed    0.82 sec
+118/158 Test #120: cxx.test_std_size_t ...............................   Passed    0.66 sec
 test 122
         Start 122: cxx.test_system_namespaces
 
@@ -5363,26 +5371,51 @@
 122: namespace notsys_ns { template <typename T> class TplClass; }
 122: ---
 122: 
-120/158 Test #122: cxx.test_system_namespaces ........................   Passed    0.95 sec
+119/158 Test #122: cxx.test_system_namespaces ........................   Passed    0.40 sec
 test 123
         Start 123: cxx.test_template_args
 
 123: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/template_args.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 123: Working Directory: /build/iwyu-8.18
 123: Test timeout computed to be: 10000000
-115: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/scope_crash.cc
-115: 
-115: (tests/cxx/scope_crash.cc has correct #includes/fwd-decls)
-115: 
-121/158 Test #115: cxx.test_scope_crash ..............................   Passed    5.07 sec
+123: INFO:root:Testing iwyu on tests/cxx/template_args.cc
+106: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --pch_in_code -Xiwyu --quoted_includes_first -I .  tests/cxx/quoted_includes_first.cc
+106: 
+106: tests/cxx/quoted_includes_first.h should add these lines:
+106: class IndirectSubDirClass;
+106: 
+106: tests/cxx/quoted_includes_first.h should remove these lines:
+106: - #include "subdir/indirect_subdir.h"  // lines 14-14
+106: - #include <iostream>  // lines 10-10
+106: - #include <list>  // lines 11-11
+106: - #include <map>  // lines 12-12
+106: 
+106: The full include-list for tests/cxx/quoted_includes_first.h:
+106: #include <memory>  // for unique_ptr
+106: class IndirectSubDirClass;
+106: ---
+106: 
+106: tests/cxx/quoted_includes_first.cc should add these lines:
+106: 
+106: tests/cxx/quoted_includes_first.cc should remove these lines:
+106: - #include <iostream>  // lines 15-15
+106: - #include <list>  // lines 16-16
+106: - #include <map>  // lines 17-17
+106: 
+106: The full include-list for tests/cxx/quoted_includes_first.cc:
+106: #include "tests/cxx/pch.h"
+106: #include "quoted_includes_first.h"
+106: #include "subdir/indirect_subdir.h"  // for IndirectSubDirClass
+106: #include <memory>                    // for unique_ptr
+106: ---
+106: 
+120/158 Test #106: cxx.test_quoted_includes_first ....................   Passed    4.62 sec
 test 124
         Start 124: cxx.test_template_default_args_roundtrip
 
 124: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/template_default_args_roundtrip.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 124: Working Directory: /build/iwyu-8.18
 124: Test timeout computed to be: 10000000
-123: INFO:root:Testing iwyu on tests/cxx/template_args.cc
-124: INFO:root:Testing iwyu on tests/cxx/template_default_args_roundtrip.cc
 123: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/template_args.cc
 123: tests/cxx/template_args.cc:20:10: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
 123: tests/cxx/template_args.cc:31:23: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
@@ -5426,32 +5459,14 @@
 123: template <typename F> struct FunctionStruct;  // lines 22-22
 123: ---
 123: 
-122/158 Test #123: cxx.test_template_args ............................   Passed    0.91 sec
+121/158 Test #123: cxx.test_template_args ............................   Passed    0.71 sec
 test 125
         Start 125: cxx.test_template_specialization
 
 125: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/template_specialization.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 125: Working Directory: /build/iwyu-8.18
 125: Test timeout computed to be: 10000000
-124: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/template_default_args_roundtrip.cc
-124: 
-124: tests/cxx/template_default_args_roundtrip.cc should add these lines:
-124: 
-124: tests/cxx/template_default_args_roundtrip.cc should remove these lines:
-124: - #include "template_default_args_roundtrip-indirect.h"  // lines 32-32
-124: 
-124: The full include-list for tests/cxx/template_default_args_roundtrip.cc:
-124: #include "template_default_args_roundtrip-direct.h"    // for DefaultArgument
-124: #include "template_default_args_roundtrip-template.h"  // for Template
-124: ---
-124: 
-123/158 Test #124: cxx.test_template_default_args_roundtrip ..........   Passed    0.97 sec
-test 126
-        Start 126: cxx.test_templated_constructor
-
-126: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/templated_constructor.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-126: Working Directory: /build/iwyu-8.18
-126: Test timeout computed to be: 10000000
+124: INFO:root:Testing iwyu on tests/cxx/template_default_args_roundtrip.cc
 125: INFO:root:Testing iwyu on tests/cxx/template_specialization.cc
 125: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/template_specialization.cc
 125: tests/cxx/template_specialization.cc:21:1: warning: Foo is defined in "tests/cxx/template_specialization-i2.h", which isn't directly #included.
@@ -5476,15 +5491,45 @@
 125: template <typename T> struct Specialized;  // lines 44-45
 125: ---
 125: 
-124/158 Test #125: cxx.test_template_specialization ..................   Passed    0.46 sec
+124: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/template_default_args_roundtrip.cc
+124: 
+124: tests/cxx/template_default_args_roundtrip.cc should add these lines:
+124: 
+124: tests/cxx/template_default_args_roundtrip.cc should remove these lines:
+124: - #include "template_default_args_roundtrip-indirect.h"  // lines 32-32
+124: 
+124: The full include-list for tests/cxx/template_default_args_roundtrip.cc:
+124: #include "template_default_args_roundtrip-direct.h"    // for DefaultArgument
+124: #include "template_default_args_roundtrip-template.h"  // for Template
+124: ---
+124: 
+115: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/scope_crash.cc
+115: 
+115: (tests/cxx/scope_crash.cc has correct #includes/fwd-decls)
+115: 
+122/158 Test #124: cxx.test_template_default_args_roundtrip ..........   Passed    0.51 sec
+test 126
+        Start 126: cxx.test_templated_constructor
+
+126: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/templated_constructor.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+126: Working Directory: /build/iwyu-8.18
+126: Test timeout computed to be: 10000000
+123/158 Test #125: cxx.test_template_specialization ..................   Passed    0.34 sec
 test 127
         Start 127: cxx.test_typedef_chain_in_template
 
 127: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/typedef_chain_in_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 127: Working Directory: /build/iwyu-8.18
 127: Test timeout computed to be: 10000000
+124/158 Test #115: cxx.test_scope_crash ..............................   Passed    3.16 sec
+test 128
+        Start 128: cxx.test_typedef_chain_no_follow
+
+128: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/typedef_chain_no_follow.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+128: Working Directory: /build/iwyu-8.18
+128: Test timeout computed to be: 10000000
 126: INFO:root:Testing iwyu on tests/cxx/templated_constructor.cc
-127: INFO:root:Testing iwyu on tests/cxx/typedef_chain_in_template.cc
+128: INFO:root:Testing iwyu on tests/cxx/typedef_chain_no_follow.cc
 126: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/templated_constructor.cc
 126: tests/cxx/templated_constructor.cc:25:3: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
 126: tests/cxx/templated_constructor.cc:28:24: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -5500,13 +5545,34 @@
 126: #include "tests/cxx/indirect.h"  // for IndirectClass
 126: ---
 126: 
-125/158 Test #126: cxx.test_templated_constructor ....................   Passed    0.85 sec
-test 128
-        Start 128: cxx.test_typedef_chain_no_follow
+127: INFO:root:Testing iwyu on tests/cxx/typedef_chain_in_template.cc
+125/158 Test #126: cxx.test_templated_constructor ....................   Passed    0.37 sec
+test 129
+        Start 129: cxx.test_typedef_in_template
 
-128: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/typedef_chain_no_follow.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-128: Working Directory: /build/iwyu-8.18
-128: Test timeout computed to be: 10000000
+129: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/typedef_in_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+129: Working Directory: /build/iwyu-8.18
+129: Test timeout computed to be: 10000000
+128: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/typedef_chain_no_follow.cc
+128: 
+128: tests/cxx/typedef_chain_no_follow.cc should add these lines:
+128: 
+128: tests/cxx/typedef_chain_no_follow.cc should remove these lines:
+128: - #include "tests/cxx/direct.h"  // lines 20-20
+128: 
+128: The full include-list for tests/cxx/typedef_chain_no_follow.cc:
+128: #include "tests/cxx/typedef_chain_no_follow-d1.h"  // for TypedefChainTypedef
+128: #include "tests/cxx/typedef_chain_no_follow-d2.h"  // for NonContainer1, NonContainer1::value_type
+128: #include "tests/cxx/typedef_chain_no_follow-d3.h"  // for NonContainer2, NonContainer2::value_type
+128: ---
+128: 
+126/158 Test #128: cxx.test_typedef_chain_no_follow ..................   Passed    0.48 sec
+test 130
+        Start 130: cxx.test_typedefs_and_resugaring
+
+130: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/typedefs_and_resugaring.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+130: Working Directory: /build/iwyu-8.18
+130: Test timeout computed to be: 10000000
 127: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/typedef_chain_in_template.cc
 127: 
 127: tests/cxx/typedef_chain_in_template.cc should add these lines:
@@ -5522,6 +5588,15 @@
 127: #include "tests/cxx/typedef_chain_in_template-d4.h"  // for ContainerLongTypedefChain
 127: ---
 127: 
+127/158 Test #127: cxx.test_typedef_chain_in_template ................   Passed    0.68 sec
+test 131
+        Start 131: cxx.test_unused_class_template_ctor
+
+131: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/unused_class_template_ctor.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+131: Working Directory: /build/iwyu-8.18
+131: Test timeout computed to be: 10000000
+129: INFO:root:Testing iwyu on tests/cxx/typedef_in_template.cc
+130: INFO:root:Testing iwyu on tests/cxx/typedefs_and_resugaring.cc
 121: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/stl_container_provides_allocator.cc
 121: 
 121: tests/cxx/stl_container_provides_allocator.cc should add these lines:
@@ -5534,43 +5609,35 @@
 121: #include <vector>  // for vector
 121: ---
 121: 
-126/158 Test #127: cxx.test_typedef_chain_in_template ................   Passed    0.90 sec
-test 129
-        Start 129: cxx.test_typedef_in_template
-
-129: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/typedef_in_template.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-129: Working Directory: /build/iwyu-8.18
-129: Test timeout computed to be: 10000000
-127/158 Test #121: cxx.test_stl_container_provides_allocator .........   Passed    3.71 sec
-test 130
-        Start 130: cxx.test_typedefs_and_resugaring
+130: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/typedefs_and_resugaring.cc
+130: tests/cxx/typedefs_and_resugaring.cc:44:3: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
+130: 
+130: tests/cxx/typedefs_and_resugaring.cc should add these lines:
+130: #include "tests/cxx/indirect.h"                    // for IndirectClass
+130: 
+130: tests/cxx/typedefs_and_resugaring.cc should remove these lines:
+130: - #include "tests/cxx/direct.h"  // lines 29-29
+130: 
+130: The full include-list for tests/cxx/typedefs_and_resugaring.cc:
+130: #include "tests/cxx/indirect.h"                    // for IndirectClass
+130: #include "tests/cxx/typedefs_and_resugaring-d1.h"  // for MyTypedef
+130: ---
+130: 
+128/158 Test #121: cxx.test_stl_container_provides_allocator .........   Passed    2.97 sec
+test 132
+        Start 132: cxx.test_update_comments
 
-130: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/typedefs_and_resugaring.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-130: Working Directory: /build/iwyu-8.18
-130: Test timeout computed to be: 10000000
-128: INFO:root:Testing iwyu on tests/cxx/typedef_chain_no_follow.cc
-129: INFO:root:Testing iwyu on tests/cxx/typedef_in_template.cc
-130: INFO:root:Testing iwyu on tests/cxx/typedefs_and_resugaring.cc
-128: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/typedef_chain_no_follow.cc
-128: 
-128: tests/cxx/typedef_chain_no_follow.cc should add these lines:
-128: 
-128: tests/cxx/typedef_chain_no_follow.cc should remove these lines:
-128: - #include "tests/cxx/direct.h"  // lines 20-20
-128: 
-128: The full include-list for tests/cxx/typedef_chain_no_follow.cc:
-128: #include "tests/cxx/typedef_chain_no_follow-d1.h"  // for TypedefChainTypedef
-128: #include "tests/cxx/typedef_chain_no_follow-d2.h"  // for NonContainer1, NonContainer1::value_type
-128: #include "tests/cxx/typedef_chain_no_follow-d3.h"  // for NonContainer2, NonContainer2::value_type
-128: ---
-128: 
-128/158 Test #128: cxx.test_typedef_chain_no_follow ..................   Passed    0.88 sec
-test 131
-        Start 131: cxx.test_unused_class_template_ctor
+132: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/update_comments.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+132: Working Directory: /build/iwyu-8.18
+132: Test timeout computed to be: 10000000
+131: INFO:root:Testing iwyu on tests/cxx/unused_class_template_ctor.cc
+129/158 Test #130: cxx.test_typedefs_and_resugaring ..................   Passed    0.57 sec
+test 133
+        Start 133: cxx.test_uses_printf
 
-131: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/unused_class_template_ctor.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-131: Working Directory: /build/iwyu-8.18
-131: Test timeout computed to be: 10000000
+133: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/uses_printf.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+133: Working Directory: /build/iwyu-8.18
+133: Test timeout computed to be: 10000000
 129: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -std=c++11 -I .  tests/cxx/typedef_in_template.cc
 129: tests/cxx/typedef_in_template.cc:25:11: warning: Pair is defined in "tests/cxx/typedef_in_template-i1.h", which isn't directly #included.
 129: tests/cxx/typedef_in_template.cc:38:13: warning: Class needs a declaration, but does not provide or directly #include one.
@@ -5607,48 +5674,27 @@
 129: #include "tests/cxx/typedef_in_template-i1.h"  // for Class, Pair
 129: ---
 129: 
-130: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/typedefs_and_resugaring.cc
-130: tests/cxx/typedefs_and_resugaring.cc:44:3: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
-130: 
-130: tests/cxx/typedefs_and_resugaring.cc should add these lines:
-130: #include "tests/cxx/indirect.h"                    // for IndirectClass
-130: 
-130: tests/cxx/typedefs_and_resugaring.cc should remove these lines:
-130: - #include "tests/cxx/direct.h"  // lines 29-29
-130: 
-130: The full include-list for tests/cxx/typedefs_and_resugaring.cc:
-130: #include "tests/cxx/indirect.h"                    // for IndirectClass
-130: #include "tests/cxx/typedefs_and_resugaring-d1.h"  // for MyTypedef
-130: ---
-130: 
-129/158 Test #129: cxx.test_typedef_in_template ......................   Passed    0.77 sec
-test 132
-        Start 132: cxx.test_update_comments
-
-132: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/update_comments.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-132: Working Directory: /build/iwyu-8.18
-132: Test timeout computed to be: 10000000
-130/158 Test #130: cxx.test_typedefs_and_resugaring ..................   Passed    0.85 sec
-test 133
-        Start 133: cxx.test_uses_printf
-
-133: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/uses_printf.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-133: Working Directory: /build/iwyu-8.18
-133: Test timeout computed to be: 10000000
-131: INFO:root:Testing iwyu on tests/cxx/unused_class_template_ctor.cc
-133: INFO:root:Testing iwyu on tests/cxx/uses_printf.cc
-132: INFO:root:Testing iwyu on tests/cxx/update_comments.cc
-131: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/unused_class_template_ctor.cc
-131: 
-131: (tests/cxx/unused_class_template_ctor.cc has correct #includes/fwd-decls)
-131: 
-131/158 Test #131: cxx.test_unused_class_template_ctor ...............   Passed    0.92 sec
+130/158 Test #129: cxx.test_typedef_in_template ......................   Passed    0.77 sec
 test 134
         Start 134: cxx.test_using_aliased_symbol
 
 134: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_aliased_symbol.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 134: Working Directory: /build/iwyu-8.18
 134: Test timeout computed to be: 10000000
+131: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/unused_class_template_ctor.cc
+131: 
+131: (tests/cxx/unused_class_template_ctor.cc has correct #includes/fwd-decls)
+131: 
+132: INFO:root:Testing iwyu on tests/cxx/update_comments.cc
+131/158 Test #131: cxx.test_unused_class_template_ctor ...............   Passed    0.56 sec
+test 135
+        Start 135: cxx.test_using_aliased_symbol_unused
+
+135: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_aliased_symbol_unused.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+135: Working Directory: /build/iwyu-8.18
+135: Test timeout computed to be: 10000000
+134: INFO:root:Testing iwyu on tests/cxx/using_aliased_symbol.cc
+133: INFO:root:Testing iwyu on tests/cxx/uses_printf.cc
 132: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --update_comments -I .  tests/cxx/update_comments.cc
 132: 
 132: tests/cxx/update_comments.cc should add these lines:
@@ -5659,36 +5705,6 @@
 132: #include "tests/cxx/indirect.h"  // for IndirectClass
 132: ---
 132: 
-133: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/uses_printf.cc
-133: tests/cxx/uses_printf.cc:16:3: warning: printf is defined in <stdio.h>, which isn't directly #included.
-133: 
-133: tests/cxx/uses_printf.cc should add these lines:
-133: #include <stdio.h>  // for printf
-133: 
-133: tests/cxx/uses_printf.cc should remove these lines:
-133: - #include "tests/cxx/uses_printf-d1.h"  // lines 12-12
-133: 
-133: The full include-list for tests/cxx/uses_printf.cc:
-133: #include <stdio.h>  // for printf
-133: ---
-133: 
-132/158 Test #132: cxx.test_update_comments ..........................   Passed    0.75 sec
-test 135
-        Start 135: cxx.test_using_aliased_symbol_unused
-
-135: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_aliased_symbol_unused.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-135: Working Directory: /build/iwyu-8.18
-135: Test timeout computed to be: 10000000
-133/158 Test #133: cxx.test_uses_printf ..............................   Passed    0.72 sec
-test 136
-        Start 136: cxx.test_using_directive_decl
-
-136: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_directive_decl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-136: Working Directory: /build/iwyu-8.18
-136: Test timeout computed to be: 10000000
-134: INFO:root:Testing iwyu on tests/cxx/using_aliased_symbol.cc
-135: INFO:root:Testing iwyu on tests/cxx/using_aliased_symbol_unused.cc
-136: INFO:root:Testing iwyu on tests/cxx/using_directive_decl.cc
 134: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/using_aliased_symbol.cc
 134: tests/cxx/using_aliased_symbol.cc:20:3: warning: ns::symbol is defined in "tests/cxx/using_aliased_symbol-declare.h", which isn't directly #included.
 134: 
@@ -5702,13 +5718,41 @@
 134: #include "using_aliased_symbol-alias.h"              // for symbol
 134: ---
 134: 
-134/158 Test #134: cxx.test_using_aliased_symbol .....................   Passed    1.01 sec
+135: INFO:root:Testing iwyu on tests/cxx/using_aliased_symbol_unused.cc
+132/158 Test #132: cxx.test_update_comments ..........................   Passed    0.36 sec
+test 136
+        Start 136: cxx.test_using_directive_decl
+
+136: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_directive_decl.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+136: Working Directory: /build/iwyu-8.18
+136: Test timeout computed to be: 10000000
+133/158 Test #134: cxx.test_using_aliased_symbol .....................   Passed    0.34 sec
 test 137
         Start 137: cxx.test_using_overload_multiple
 
 137: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_overload_multiple.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 137: Working Directory: /build/iwyu-8.18
 137: Test timeout computed to be: 10000000
+133: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/uses_printf.cc
+133: tests/cxx/uses_printf.cc:16:3: warning: printf is defined in <stdio.h>, which isn't directly #included.
+133: 
+133: tests/cxx/uses_printf.cc should add these lines:
+133: #include <stdio.h>  // for printf
+133: 
+133: tests/cxx/uses_printf.cc should remove these lines:
+133: - #include "tests/cxx/uses_printf-d1.h"  // lines 12-12
+133: 
+133: The full include-list for tests/cxx/uses_printf.cc:
+133: #include <stdio.h>  // for printf
+133: ---
+133: 
+134/158 Test #133: cxx.test_uses_printf ..............................   Passed    0.45 sec
+test 138
+        Start 138: cxx.test_using_overload_single
+
+138: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_overload_single.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+138: Working Directory: /build/iwyu-8.18
+138: Test timeout computed to be: 10000000
 135: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/using_aliased_symbol_unused.cc
 135: 
 135: tests/cxx/using_aliased_symbol_unused.cc should add these lines:
@@ -5719,18 +5763,8 @@
 135: The full include-list for tests/cxx/using_aliased_symbol_unused.cc:
 135: ---
 135: 
-135/158 Test #135: cxx.test_using_aliased_symbol_unused ..............   Passed    1.02 sec
-test 138
-        Start 138: cxx.test_using_overload_single
-
-138: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_overload_single.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-138: Working Directory: /build/iwyu-8.18
-138: Test timeout computed to be: 10000000
-136: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/using_directive_decl.cc
-136: 
-136: (tests/cxx/using_directive_decl.cc has correct #includes/fwd-decls)
-136: 
-136/158 Test #136: cxx.test_using_directive_decl .....................   Passed    1.03 sec
+136: INFO:root:Testing iwyu on tests/cxx/using_directive_decl.cc
+135/158 Test #135: cxx.test_using_aliased_symbol_unused ..............   Passed    0.37 sec
 test 139
         Start 139: cxx.test_using_specialization
 
@@ -5738,30 +5772,30 @@
 139: Working Directory: /build/iwyu-8.18
 139: Test timeout computed to be: 10000000
 137: INFO:root:Testing iwyu on tests/cxx/using_overload_multiple.cc
-138: INFO:root:Testing iwyu on tests/cxx/using_overload_single.cc
-137: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/using_overload_multiple.cc
-137: 
-137: (tests/cxx/using_overload_multiple.cc has correct #includes/fwd-decls)
-137: 
-139: INFO:root:Testing iwyu on tests/cxx/using_specialization.cc
-137/158 Test #137: cxx.test_using_overload_multiple ..................   Passed    0.84 sec
+136: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/using_directive_decl.cc
+136: 
+136: (tests/cxx/using_directive_decl.cc has correct #includes/fwd-decls)
+136: 
+136/158 Test #136: cxx.test_using_directive_decl .....................   Passed    0.34 sec
 test 140
         Start 140: cxx.test_using_unused
 
 140: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/using_unused.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 140: Working Directory: /build/iwyu-8.18
 140: Test timeout computed to be: 10000000
-138: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/using_overload_single.cc
-138: 
-138: tests/cxx/using_overload_single.cc should add these lines:
-138: 
-138: tests/cxx/using_overload_single.cc should remove these lines:
-138: - #include "using_overload-float.h"  // lines 15-15
-138: 
-138: The full include-list for tests/cxx/using_overload_single.cc:
-138: #include "using_overload-int.h"  // for add
-138: ---
-138: 
+139: INFO:root:Testing iwyu on tests/cxx/using_specialization.cc
+138: INFO:root:Testing iwyu on tests/cxx/using_overload_single.cc
+137: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/using_overload_multiple.cc
+137: 
+137: (tests/cxx/using_overload_multiple.cc has correct #includes/fwd-decls)
+137: 
+137/158 Test #137: cxx.test_using_overload_multiple ..................   Passed    0.47 sec
+test 141
+        Start 141: cxx.test_varargs_and_references
+
+141: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/varargs_and_references.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+141: Working Directory: /build/iwyu-8.18
+141: Test timeout computed to be: 10000000
 139: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/using_specialization.cc
 139: 
 139: tests/cxx/using_specialization.cc should add these lines:
@@ -5773,14 +5807,7 @@
 139: #include "template_specialization-i1.h"  // for Foo
 139: ---
 139: 
-138/158 Test #139: cxx.test_using_specialization .....................   Passed    0.75 sec
-test 141
-        Start 141: cxx.test_varargs_and_references
-
-141: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/cxx/varargs_and_references.cc" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-141: Working Directory: /build/iwyu-8.18
-141: Test timeout computed to be: 10000000
-139/158 Test #138: cxx.test_using_overload_single ....................   Passed    0.94 sec
+138/158 Test #139: cxx.test_using_specialization .....................   Passed    0.39 sec
 test 142
         Start 142: cxx.test_virtual_tpl_method
 
@@ -5788,12 +5815,62 @@
 142: Working Directory: /build/iwyu-8.18
 142: Test timeout computed to be: 10000000
 140: INFO:root:Testing iwyu on tests/cxx/using_unused.cc
-141: INFO:root:Testing iwyu on tests/cxx/varargs_and_references.cc
-142: INFO:root:Testing iwyu on tests/cxx/virtual_tpl_method.cc
+138: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/using_overload_single.cc
+138: 
+138: tests/cxx/using_overload_single.cc should add these lines:
+138: 
+138: tests/cxx/using_overload_single.cc should remove these lines:
+138: - #include "using_overload-float.h"  // lines 15-15
+138: 
+138: The full include-list for tests/cxx/using_overload_single.cc:
+138: #include "using_overload-int.h"  // for add
+138: ---
+138: 
+139/158 Test #138: cxx.test_using_overload_single ....................   Passed    0.69 sec
+test 143
+        Start 143: driver.test_exitcode_bad_args
+
+143: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_bad_args.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+143: Working Directory: /build/iwyu-8.18
+143: Test timeout computed to be: 10000000
 140: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/cxx/using_unused.cc
 140: 
 140: (tests/cxx/using_unused.cc has correct #includes/fwd-decls)
 140: 
+140/158 Test #140: cxx.test_using_unused .............................   Passed    0.56 sec
+test 144
+        Start 144: driver.test_exitcode_good
+
+144: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+144: Working Directory: /build/iwyu-8.18
+144: Test timeout computed to be: 10000000
+141: INFO:root:Testing iwyu on tests/cxx/varargs_and_references.cc
+142: INFO:root:Testing iwyu on tests/cxx/virtual_tpl_method.cc
+141: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/varargs_and_references.cc
+141: tests/cxx/varargs_and_references.cc:31:3: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
+141: tests/cxx/varargs_and_references.cc:33:9: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
+141: tests/cxx/varargs_and_references.cc:35:16: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
+141: tests/cxx/varargs_and_references.cc:37:16: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
+141: tests/cxx/varargs_and_references.cc:39:16: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
+141: 
+141: tests/cxx/varargs_and_references.cc should add these lines:
+141: #include "tests/cxx/indirect.h"  // for IndirectClass
+141: 
+141: tests/cxx/varargs_and_references.cc should remove these lines:
+141: - #include "tests/cxx/direct.h"  // lines 20-20
+141: 
+141: The full include-list for tests/cxx/varargs_and_references.cc:
+141: #include "tests/cxx/indirect.h"  // for IndirectClass
+141: ---
+141: 
+141/158 Test #141: cxx.test_varargs_and_references ...................   Passed    0.55 sec
+test 145
+        Start 145: driver.test_exitcode_good_error
+
+145: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+145: Working Directory: /build/iwyu-8.18
+145: Test timeout computed to be: 10000000
+144: INFO:root:Testing iwyu on tests/driver/exitcode_good.c
 142: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/virtual_tpl_method.cc
 142: tests/cxx/virtual_tpl_method.cc:24:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
 142: tests/cxx/virtual_tpl_method.cc:36:1: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
@@ -5821,51 +5898,26 @@
 142: #include "tests/cxx/indirect.h"  // for IndirectClass
 142: ---
 142: 
-141: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I .  tests/cxx/varargs_and_references.cc
-141: tests/cxx/varargs_and_references.cc:31:3: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
-141: tests/cxx/varargs_and_references.cc:33:9: warning: IndirectClass needs a declaration, but does not provide or directly #include one.
-141: tests/cxx/varargs_and_references.cc:35:16: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
-141: tests/cxx/varargs_and_references.cc:37:16: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
-141: tests/cxx/varargs_and_references.cc:39:16: warning: IndirectClass is defined in "tests/cxx/indirect.h", which isn't directly #included.
-141: 
-141: tests/cxx/varargs_and_references.cc should add these lines:
-141: #include "tests/cxx/indirect.h"  // for IndirectClass
-141: 
-141: tests/cxx/varargs_and_references.cc should remove these lines:
-141: - #include "tests/cxx/direct.h"  // lines 20-20
-141: 
-141: The full include-list for tests/cxx/varargs_and_references.cc:
-141: #include "tests/cxx/indirect.h"  // for IndirectClass
-141: ---
-141: 
-140/158 Test #140: cxx.test_using_unused .............................   Passed    0.78 sec
-test 143
-        Start 143: driver.test_exitcode_bad_args
-
-143: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_bad_args.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-143: Working Directory: /build/iwyu-8.18
-143: Test timeout computed to be: 10000000
-141/158 Test #142: cxx.test_virtual_tpl_method .......................   Passed    0.56 sec
-test 144
-        Start 144: driver.test_exitcode_good
-
-144: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-144: Working Directory: /build/iwyu-8.18
-144: Test timeout computed to be: 10000000
-142/158 Test #141: cxx.test_varargs_and_references ...................   Passed    0.65 sec
-test 145
-        Start 145: driver.test_exitcode_good_error
+143: INFO:root:Testing iwyu on tests/driver/exitcode_bad_args.c
+142/158 Test #142: cxx.test_virtual_tpl_method .......................   Passed    0.60 sec
+test 146
+        Start 146: driver.test_exitcode_good_error_always
 
-145: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-145: Working Directory: /build/iwyu-8.18
-145: Test timeout computed to be: 10000000
+146: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error_always.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+146: Working Directory: /build/iwyu-8.18
+146: Test timeout computed to be: 10000000
+144: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/driver/exitcode_good.c
+144: 
+144: (tests/driver/exitcode_good.c has correct #includes/fwd-decls)
+144: 
 145: INFO:root:Testing iwyu on tests/driver/exitcode_good_error.c
-143: INFO:root:Testing iwyu on tests/driver/exitcode_bad_args.c
-144: INFO:root:Testing iwyu on tests/driver/exitcode_good.c
-145: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --error  tests/driver/exitcode_good_error.c
-145: 
-145: (tests/driver/exitcode_good_error.c has correct #includes/fwd-decls)
-145: 
+143/158 Test #144: driver.test_exitcode_good .........................   Passed    0.32 sec
+test 147
+        Start 147: driver.test_exitcode_good_error_always_arg
+
+147: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error_always_arg.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+147: Working Directory: /build/iwyu-8.18
+147: Test timeout computed to be: 10000000
 143: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -some -unsupported -Xiwyu -arguments  tests/driver/exitcode_bad_args.c
 143: /build/iwyu-8.18/iwyu-build/bin/include-what-you-use: invalid option -- 'a'
 143: USAGE: include-what-you-use [-Xiwyu --iwyu_opt]... <clang opts> <source file>
@@ -5923,45 +5975,39 @@
 143: FATAL ERROR: unknown flag.
 143: 
 143: 
-143/158 Test #145: driver.test_exitcode_good_error ...................   Passed    0.61 sec
-test 146
-        Start 146: driver.test_exitcode_good_error_always
-
-146: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error_always.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-146: Working Directory: /build/iwyu-8.18
-146: Test timeout computed to be: 10000000
-144/158 Test #143: driver.test_exitcode_bad_args .....................   Passed    0.78 sec
-test 147
-        Start 147: driver.test_exitcode_good_error_always_arg
-
-147: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error_always_arg.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-147: Working Directory: /build/iwyu-8.18
-147: Test timeout computed to be: 10000000
-144: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/driver/exitcode_good.c
-144: 
-144: (tests/driver/exitcode_good.c has correct #includes/fwd-decls)
-144: 
-145/158 Test #144: driver.test_exitcode_good .........................   Passed    0.95 sec
+144/158 Test #143: driver.test_exitcode_bad_args .....................   Passed    0.47 sec
 test 148
         Start 148: driver.test_exitcode_good_error_and_always
 
 148: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error_and_always.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 148: Working Directory: /build/iwyu-8.18
 148: Test timeout computed to be: 10000000
+145: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --error  tests/driver/exitcode_good_error.c
+145: 
+145: (tests/driver/exitcode_good_error.c has correct #includes/fwd-decls)
+145: 
+145/158 Test #145: driver.test_exitcode_good_error ...................   Passed    0.30 sec
+test 149
+        Start 149: driver.test_exitcode_good_error_arg
+
+149: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error_arg.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+149: Working Directory: /build/iwyu-8.18
+149: Test timeout computed to be: 10000000
 146: INFO:root:Testing iwyu on tests/driver/exitcode_good_error_always.c
 147: INFO:root:Testing iwyu on tests/driver/exitcode_good_error_always_arg.c
+148: INFO:root:Testing iwyu on tests/driver/exitcode_good_error_and_always.c
 146: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --error_always  tests/driver/exitcode_good_error_always.c
 146: 
 146: (tests/driver/exitcode_good_error_always.c has correct #includes/fwd-decls)
 146: 
-148: INFO:root:Testing iwyu on tests/driver/exitcode_good_error_and_always.c
-146/158 Test #146: driver.test_exitcode_good_error_always ............   Passed    0.69 sec
-test 149
-        Start 149: driver.test_exitcode_good_error_arg
+146/158 Test #146: driver.test_exitcode_good_error_always ............   Passed    0.36 sec
+test 150
+        Start 150: driver.test_exitcode_syntax_error
 
-149: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_good_error_arg.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-149: Working Directory: /build/iwyu-8.18
-149: Test timeout computed to be: 10000000
+150: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_syntax_error.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+150: Working Directory: /build/iwyu-8.18
+150: Test timeout computed to be: 10000000
+149: INFO:root:Testing iwyu on tests/driver/exitcode_good_error_arg.c
 147: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --error_always=100  tests/driver/exitcode_good_error_always_arg.c
 147: 
 147: (tests/driver/exitcode_good_error_always_arg.c has correct #includes/fwd-decls)
@@ -5970,34 +6016,35 @@
 148: 
 148: (tests/driver/exitcode_good_error_and_always.c has correct #includes/fwd-decls)
 148: 
-147/158 Test #148: driver.test_exitcode_good_error_and_always ........   Passed    0.58 sec
-test 150
-        Start 150: driver.test_exitcode_syntax_error
-
-150: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_syntax_error.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-150: Working Directory: /build/iwyu-8.18
-150: Test timeout computed to be: 10000000
-148/158 Test #147: driver.test_exitcode_good_error_always_arg ........   Passed    0.79 sec
+147/158 Test #147: driver.test_exitcode_good_error_always_arg ........   Passed    0.43 sec
 test 151
         Start 151: driver.test_exitcode_warn
 
 151: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_warn.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 151: Working Directory: /build/iwyu-8.18
 151: Test timeout computed to be: 10000000
-149: INFO:root:Testing iwyu on tests/driver/exitcode_good_error_arg.c
 149: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -Xiwyu --error=100  tests/driver/exitcode_good_error_arg.c
 149: 
 149: (tests/driver/exitcode_good_error_arg.c has correct #includes/fwd-decls)
 149: 
-149/158 Test #149: driver.test_exitcode_good_error_arg ...............   Passed    0.48 sec
+148/158 Test #149: driver.test_exitcode_good_error_arg ...............   Passed    0.34 sec
 test 152
         Start 152: driver.test_exitcode_warn_error
 
 152: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_warn_error.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 152: Working Directory: /build/iwyu-8.18
 152: Test timeout computed to be: 10000000
-151: INFO:root:Testing iwyu on tests/driver/exitcode_warn.c
+149/158 Test #148: driver.test_exitcode_good_error_and_always ........   Passed    0.45 sec
+test 153
+        Start 153: driver.test_exitcode_warn_error_always
+
+153: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_warn_error_always.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+153: Working Directory: /build/iwyu-8.18
+153: Test timeout computed to be: 10000000
 150: INFO:root:Testing iwyu on tests/driver/exitcode_syntax_error.c
+151: INFO:root:Testing iwyu on tests/driver/exitcode_warn.c
+153: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error_always.c
+152: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error.c
 150: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3   tests/driver/exitcode_syntax_error.c
 150: tests/driver/exitcode_syntax_error.c:15:1: error: unknown type name 'this'
 150: this is not valid C code;
@@ -6020,21 +6067,19 @@
 151: #include "tests/driver/indirect.h"  // for Indirect
 151: ---
 151: 
-150/158 Test #151: driver.test_exitcode_warn .........................   Passed    0.82 sec
-test 153
-        Start 153: driver.test_exitcode_warn_error_always
-
-153: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_warn_error_always.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-153: Working Directory: /build/iwyu-8.18
-153: Test timeout computed to be: 10000000
-151/158 Test #150: driver.test_exitcode_syntax_error .................   Passed    0.86 sec
-test 154
-        Start 154: driver.test_exitcode_warn_error_always_arg
-
-154: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_warn_error_always_arg.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
-154: Working Directory: /build/iwyu-8.18
-154: Test timeout computed to be: 10000000
-152: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error.c
+153: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I . -Xiwyu --error_always  tests/driver/exitcode_warn_error_always.c
+153: tests/driver/exitcode_warn_error_always.c:19:8: warning: Indirect is defined in "tests/driver/indirect.h", which isn't directly #included.
+153: 
+153: tests/driver/exitcode_warn_error_always.c should add these lines:
+153: #include "tests/driver/indirect.h"  // for Indirect
+153: 
+153: tests/driver/exitcode_warn_error_always.c should remove these lines:
+153: - #include "tests/driver/direct.h"  // lines 16-16
+153: 
+153: The full include-list for tests/driver/exitcode_warn_error_always.c:
+153: #include "tests/driver/indirect.h"  // for Indirect
+153: ---
+153: 
 152: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I . -Xiwyu --error  tests/driver/exitcode_warn_error.c
 152: tests/driver/exitcode_warn_error.c:18:8: warning: Indirect is defined in "tests/driver/indirect.h", which isn't directly #included.
 152: 
@@ -6048,56 +6093,36 @@
 152: #include "tests/driver/indirect.h"  // for Indirect
 152: ---
 152: 
-154: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error_always_arg.c
-152/158 Test #152: driver.test_exitcode_warn_error ...................   Passed    0.88 sec
+150/158 Test #151: driver.test_exitcode_warn .........................   Passed    0.56 sec
+test 154
+        Start 154: driver.test_exitcode_warn_error_always_arg
+
+154: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_warn_error_always_arg.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
+154: Working Directory: /build/iwyu-8.18
+154: Test timeout computed to be: 10000000
+151/158 Test #150: driver.test_exitcode_syntax_error .................   Passed    0.68 sec
 test 155
         Start 155: driver.test_exitcode_warn_error_and_always
 
 155: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_warn_error_and_always.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 155: Working Directory: /build/iwyu-8.18
 155: Test timeout computed to be: 10000000
-153: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error_always.c
-154: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I . -Xiwyu --error_always=11  tests/driver/exitcode_warn_error_always_arg.c
-154: tests/driver/exitcode_warn_error_always_arg.c:19:8: warning: Indirect is defined in "tests/driver/indirect.h", which isn't directly #included.
-154: 
-154: tests/driver/exitcode_warn_error_always_arg.c should add these lines:
-154: #include "tests/driver/indirect.h"  // for Indirect
-154: 
-154: tests/driver/exitcode_warn_error_always_arg.c should remove these lines:
-154: - #include "tests/driver/direct.h"  // lines 16-16
-154: 
-154: The full include-list for tests/driver/exitcode_warn_error_always_arg.c:
-154: #include "tests/driver/indirect.h"  // for Indirect
-154: ---
-154: 
-153: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I . -Xiwyu --error_always  tests/driver/exitcode_warn_error_always.c
-153: tests/driver/exitcode_warn_error_always.c:19:8: warning: Indirect is defined in "tests/driver/indirect.h", which isn't directly #included.
-153: 
-153: tests/driver/exitcode_warn_error_always.c should add these lines:
-153: #include "tests/driver/indirect.h"  // for Indirect
-153: 
-153: tests/driver/exitcode_warn_error_always.c should remove these lines:
-153: - #include "tests/driver/direct.h"  // lines 16-16
-153: 
-153: The full include-list for tests/driver/exitcode_warn_error_always.c:
-153: #include "tests/driver/indirect.h"  // for Indirect
-153: ---
-153: 
-153/158 Test #154: driver.test_exitcode_warn_error_always_arg ........   Passed    0.61 sec
+152/158 Test #153: driver.test_exitcode_warn_error_always ............   Passed    0.52 sec
 test 156
         Start 156: driver.test_exitcode_warn_error_arg
 
 156: Test command: /usr/bin/python3 "run_iwyu_tests.py" "--run-test-file=tests/driver/exitcode_warn_error_arg.c" "--" "/build/iwyu-8.18/iwyu-build/bin/include-what-you-use"
 156: Working Directory: /build/iwyu-8.18
 156: Test timeout computed to be: 10000000
-155: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error_and_always.c
-154/158 Test #153: driver.test_exitcode_warn_error_always ............   Passed    0.69 sec
+153/158 Test #152: driver.test_exitcode_warn_error ...................   Passed    0.55 sec
 test 157
         Start 157: fix_includes_test
 
 157: Test command: /usr/bin/python3 "fix_includes_test.py"
 157: Working Directory: /build/iwyu-8.18
 157: Test timeout computed to be: 10000000
+156: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error_arg.c
+155: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error_and_always.c
 155: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I . -Xiwyu --error=15 -Xiwyu --error_always=51  tests/driver/exitcode_warn_error_and_always.c
 155: tests/driver/exitcode_warn_error_and_always.c:17:8: warning: Indirect is defined in "tests/driver/indirect.h", which isn't directly #included.
 155: 
@@ -6111,8 +6136,8 @@
 155: #include "tests/driver/indirect.h"  // for Indirect
 155: ---
 155: 
-156: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error_arg.c
-155/158 Test #155: driver.test_exitcode_warn_error_and_always ........   Passed    0.77 sec
+154: INFO:root:Testing iwyu on tests/driver/exitcode_warn_error_always_arg.c
+154/158 Test #155: driver.test_exitcode_warn_error_and_always ........   Passed    0.30 sec
 test 158
         Start 158: iwyu_tool_test
 
@@ -6132,30 +6157,44 @@
 156: #include "tests/driver/indirect.h"  // for Indirect
 156: ---
 156: 
-156/158 Test #156: driver.test_exitcode_warn_error_arg ...............   Passed    0.80 sec
+155/158 Test #156: driver.test_exitcode_warn_error_arg ...............   Passed    0.33 sec
+154: >>> Running /build/iwyu-8.18/iwyu-build/bin/include-what-you-use -Xiwyu --verbose=3 -I . -Xiwyu --error_always=11  tests/driver/exitcode_warn_error_always_arg.c
+154: tests/driver/exitcode_warn_error_always_arg.c:19:8: warning: Indirect is defined in "tests/driver/indirect.h", which isn't directly #included.
+154: 
+154: tests/driver/exitcode_warn_error_always_arg.c should add these lines:
+154: #include "tests/driver/indirect.h"  // for Indirect
+154: 
+154: tests/driver/exitcode_warn_error_always_arg.c should remove these lines:
+154: - #include "tests/driver/direct.h"  // lines 16-16
+154: 
+154: The full include-list for tests/driver/exitcode_warn_error_always_arg.c:
+154: #include "tests/driver/indirect.h"  // for Indirect
+154: ---
+154: 
+156/158 Test #154: driver.test_exitcode_warn_error_always_arg ........   Passed    0.45 sec
 157: ............................................................................................................................................
 157: ----------------------------------------------------------------------
-157: Ran 140 tests in 0.354s
+157: Ran 140 tests in 0.195s
 157: 
 157: OK
-157/158 Test #157: fix_includes_test .................................   Passed    1.19 sec
+157/158 Test #157: fix_includes_test .................................   Passed    0.53 sec
 158: ...........s.s..........
 158: ----------------------------------------------------------------------
-158: Ran 24 tests in 0.891s
+158: Ran 24 tests in 0.544s
 158: 
 158: OK (skipped=2)
-158/158 Test #158: iwyu_tool_test ....................................   Passed    1.52 sec
+158/158 Test #158: iwyu_tool_test ....................................   Passed    0.80 sec
 
 99% tests passed, 1 tests failed out of 158
 
-Total Test time (real) =  70.31 sec
+Total Test time (real) =  27.17 sec
 
 The following tests FAILED:
 	 79 - cxx.test_ms_inline_asm (Failed)
 Errors while running CTest
 make[2]: *** [Makefile:74: test] Error 8
 make[2]: Leaving directory '/build/iwyu-8.18/iwyu-build'
-dh_auto_test: error: cd iwyu-build && make -j3 test ARGS\+=--verbose ARGS\+=-j3 returned exit code 2
+dh_auto_test: error: cd iwyu-build && make -j4 test ARGS\+=--verbose ARGS\+=-j4 returned exit code 2
 make[1]: Leaving directory '/build/iwyu-8.18'
    create-stamp debian/debhelper-build-stamp
  fakeroot debian/rules binary
@@ -6165,7 +6204,7 @@
    debian/rules override_dh_auto_install
 make[1]: Entering directory '/build/iwyu-8.18'
 dh_auto_install
-	cd iwyu-build && make -j3 install DESTDIR=/build/iwyu-8.18/debian/iwyu AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true"
+	cd iwyu-build && make -j4 install DESTDIR=/build/iwyu-8.18/debian/iwyu AM_UPDATE_INFO_DIR=no "INSTALL=install --strip-program=true"
 make[2]: Entering directory '/build/iwyu-8.18/iwyu-build'
 /usr/bin/cmake -S/build/iwyu-8.18 -B/build/iwyu-8.18/iwyu-build --check-build-system CMakeFiles/Makefile.cmake 0
 make  -f CMakeFiles/Makefile2 preinstall
@@ -6224,8 +6263,8 @@
    dh_gencontrol -O--buildsystem=cmake -O--builddirectory=iwyu-build
    dh_md5sums -O--buildsystem=cmake -O--builddirectory=iwyu-build
    dh_builddeb -O--buildsystem=cmake -O--builddirectory=iwyu-build
-dpkg-deb: building package 'iwyu-dbgsym' in '../iwyu-dbgsym_8.18-2_armhf.deb'.
 dpkg-deb: building package 'iwyu' in '../iwyu_8.18-2_armhf.deb'.
+dpkg-deb: building package 'iwyu-dbgsym' in '../iwyu-dbgsym_8.18-2_armhf.deb'.
  dpkg-genbuildinfo --build=binary -O../iwyu_8.18-2_armhf.buildinfo
  dpkg-genchanges --build=binary -O../iwyu_8.18-2_armhf.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -6233,12 +6272,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/17943/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/17943/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/3656 and its subdirectories
-I: Current time: Fri May 26 09:21:12 -12 2023
-I: pbuilder-time-stamp: 1685136072
+I: removing directory /srv/workspace/pbuilder/17943 and its subdirectories
+I: Current time: Sat May 27 11:34:02 +14 2023
+I: pbuilder-time-stamp: 1685136842