One more dircondensation for rc1.dirc2

111 files changed, 25 insertions, 25 deletions

diff --git a/test cases/common/252 subproject dependency variables/meson.build b/test cases/common/253 subproject dependency variables/meson.build
index 403b6f11c..403b6f11c 100644
--- a/test cases/common/252 subproject dependency variables/meson.build
+++ b/test cases/common/253 subproject dependency variables/meson.build
diff --git a/test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c b/test cases/common/253 subproject dependency variables/subprojects/subfiles/foo.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c
+++ b/test cases/common/253 subproject dependency variables/subprojects/subfiles/foo.c
diff --git a/test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build b/test cases/common/253 subproject dependency variables/subprojects/subfiles/meson.build
index f5ad0f2d9..f5ad0f2d9 100644
--- a/test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build
+++ b/test cases/common/253 subproject dependency variables/subprojects/subfiles/meson.build
diff --git a/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c b/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir/foo.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c
+++ b/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir/foo.c
diff --git a/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c b/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir2/foo.c
index 78f2de106..78f2de106 100644
--- a/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c
+++ b/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir2/foo.c
diff --git a/test cases/common/252 subproject dependency variables/test.json b/test cases/common/253 subproject dependency variables/test.json
index c345bbea5..c345bbea5 100644
--- a/test cases/common/252 subproject dependency variables/test.json
+++ b/test cases/common/253 subproject dependency variables/test.json
diff --git a/test cases/common/253 long output/dumper.c b/test cases/common/254 long output/dumper.c
index d479e08ad..d479e08ad 100644
--- a/test cases/common/253 long output/dumper.c
+++ b/test cases/common/254 long output/dumper.c
diff --git a/test cases/common/253 long output/meson.build b/test cases/common/254 long output/meson.build
index 6d8d62b22..6d8d62b22 100644
--- a/test cases/common/253 long output/meson.build
+++ b/test cases/common/254 long output/meson.build
diff --git a/test cases/common/253 module warnings/meson.build b/test cases/common/255 module warnings/meson.build
index 56e205526..56e205526 100644
--- a/test cases/common/253 module warnings/meson.build
+++ b/test cases/common/255 module warnings/meson.build
diff --git a/test cases/common/253 module warnings/test.json b/test cases/common/255 module warnings/test.json
index be3160129..5556b90e2 100644
--- a/test cases/common/253 module warnings/test.json
+++ b/test cases/common/255 module warnings/test.json
@@ -1,16 +1,16 @@
 {
   "stdout": [
     {
-      "line": "test cases/common/253 module warnings/meson.build:3: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.48.0': module python3."
+      "line": "test cases/common/255 module warnings/meson.build:3: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.48.0': module python3."
     },
     {
-      "line": "test cases/common/253 module warnings/meson.build:4: WARNING: Project targets '>= 0.56' but uses feature introduced in '0.60.0': module java."
+      "line": "test cases/common/255 module warnings/meson.build:4: WARNING: Project targets '>= 0.56' but uses feature introduced in '0.60.0': module java."
     },
     {
-      "line": "test cases/common/253 module warnings/meson.build:5: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.56.0': module keyval has been stabilized. drop \"unstable-\" prefix from the module name"
+      "line": "test cases/common/255 module warnings/meson.build:5: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.56.0': module keyval has been stabilized. drop \"unstable-\" prefix from the module name"
     },
     {
-      "line": "test cases/common/253 module warnings/meson.build:6: DEPRECATION: Importing unstable modules as \"unstable_simd\" instead of \"unstable-simd\""
+      "line": "test cases/common/255 module warnings/meson.build:6: DEPRECATION: Importing unstable modules as \"unstable_simd\" instead of \"unstable-simd\""
     }
   ]
 }
diff --git a/test cases/common/253 subproject extracted objects/foo.c b/test cases/common/256 subproject extracted objects/foo.c
index f6c7aebe0..f6c7aebe0 100644
--- a/test cases/common/253 subproject extracted objects/foo.c
+++ b/test cases/common/256 subproject extracted objects/foo.c
diff --git a/test cases/common/253 subproject extracted objects/meson.build b/test cases/common/256 subproject extracted objects/meson.build
index bad450fab..bad450fab 100644
--- a/test cases/common/253 subproject extracted objects/meson.build
+++ b/test cases/common/256 subproject extracted objects/meson.build
diff --git a/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.cpp b/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.cpp
index 12ef756c7..12ef756c7 100644
--- a/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.cpp
+++ b/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.cpp
diff --git a/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.h b/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.h
index a1c38b3ba..a1c38b3ba 100644
--- a/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.h
+++ b/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.h
diff --git a/test cases/common/253 subproject extracted objects/subprojects/myobjects/meson.build b/test cases/common/256 subproject extracted objects/subprojects/myobjects/meson.build
index 1c2729bc1..1c2729bc1 100644
--- a/test cases/common/253 subproject extracted objects/subprojects/myobjects/meson.build
+++ b/test cases/common/256 subproject extracted objects/subprojects/myobjects/meson.build
diff --git a/test cases/common/253 subproject extracted objects/test.json b/test cases/common/256 subproject extracted objects/test.json
index baa5dfb8b..baa5dfb8b 100644
--- a/test cases/common/253 subproject extracted objects/test.json
+++ b/test cases/common/256 subproject extracted objects/test.json
diff --git a/test cases/common/254 generated header dep/foo.c b/test cases/common/257 generated header dep/foo.c
index f4de601ff..f4de601ff 100644
--- a/test cases/common/254 generated header dep/foo.c
+++ b/test cases/common/257 generated header dep/foo.c
diff --git a/test cases/common/254 generated header dep/meson.build b/test cases/common/257 generated header dep/meson.build
index 195d082ac..195d082ac 100644
--- a/test cases/common/254 generated header dep/meson.build
+++ b/test cases/common/257 generated header dep/meson.build
diff --git a/test cases/common/254 subsubproject inplace/meson.build b/test cases/common/258 subsubproject inplace/meson.build
index 26a421b32..26a421b32 100644
--- a/test cases/common/254 subsubproject inplace/meson.build
+++ b/test cases/common/258 subsubproject inplace/meson.build
diff --git a/test cases/common/254 subsubproject inplace/subprojects/sub/meson.build b/test cases/common/258 subsubproject inplace/subprojects/sub/meson.build
index 5e33d2193..5e33d2193 100644
--- a/test cases/common/254 subsubproject inplace/subprojects/sub/meson.build
+++ b/test cases/common/258 subsubproject inplace/subprojects/sub/meson.build
diff --git a/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build b/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build
index 7807a1bae..7807a1bae 100644
--- a/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build
+++ b/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build
diff --git a/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap b/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap
index bf398525a..bf398525a 100644
--- a/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap
+++ b/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap
diff --git a/test cases/common/255 preprocess/bar.c b/test cases/common/259 preprocess/bar.c
index 43737b940..43737b940 100644
--- a/test cases/common/255 preprocess/bar.c
+++ b/test cases/common/259 preprocess/bar.c
diff --git a/test cases/common/255 preprocess/foo.c b/test cases/common/259 preprocess/foo.c
index c9d16c5eb..c9d16c5eb 100644
--- a/test cases/common/255 preprocess/foo.c
+++ b/test cases/common/259 preprocess/foo.c
diff --git a/test cases/common/255 preprocess/foo.h b/test cases/common/259 preprocess/foo.h
index ba60bf396..ba60bf396 100644
--- a/test cases/common/255 preprocess/foo.h
+++ b/test cases/common/259 preprocess/foo.h
diff --git a/test cases/common/255 preprocess/meson.build b/test cases/common/259 preprocess/meson.build
index 4824598e7..4824598e7 100644
--- a/test cases/common/255 preprocess/meson.build
+++ b/test cases/common/259 preprocess/meson.build
diff --git a/test cases/common/255 preprocess/src/file.map.in b/test cases/common/259 preprocess/src/file.map.in
index 152fb6561..152fb6561 100644
--- a/test cases/common/255 preprocess/src/file.map.in
+++ b/test cases/common/259 preprocess/src/file.map.in
diff --git a/test cases/common/255 preprocess/src/meson.build b/test cases/common/259 preprocess/src/meson.build
index 4cd955444..4cd955444 100644
--- a/test cases/common/255 preprocess/src/meson.build
+++ b/test cases/common/259 preprocess/src/meson.build
diff --git a/test cases/unit/101 relative find program/foo.py b/test cases/unit/100 relative find program/foo.py
index 21239b74b..21239b74b 100755
--- a/test cases/unit/101 relative find program/foo.py
+++ b/test cases/unit/100 relative find program/foo.py
diff --git a/test cases/unit/101 relative find program/meson.build b/test cases/unit/100 relative find program/meson.build
index 5745d8acb..5745d8acb 100644
--- a/test cases/unit/101 relative find program/meson.build
+++ b/test cases/unit/100 relative find program/meson.build
diff --git a/test cases/unit/101 relative find program/subdir/meson.build b/test cases/unit/100 relative find program/subdir/meson.build
index 475f5f51c..475f5f51c 100644
--- a/test cases/unit/101 relative find program/subdir/meson.build
+++ b/test cases/unit/100 relative find program/subdir/meson.build
diff --git a/test cases/unit/102 rlib linkage/lib2.rs b/test cases/unit/101 rlib linkage/lib2.rs
index 3487bc5a9..3487bc5a9 100644
--- a/test cases/unit/102 rlib linkage/lib2.rs
+++ b/test cases/unit/101 rlib linkage/lib2.rs
diff --git a/test cases/unit/102 rlib linkage/main.rs b/test cases/unit/101 rlib linkage/main.rs
index d0f82e4e1..d0f82e4e1 100644
--- a/test cases/unit/102 rlib linkage/main.rs
+++ b/test cases/unit/101 rlib linkage/main.rs
diff --git a/test cases/unit/102 rlib linkage/meson.build b/test cases/unit/101 rlib linkage/meson.build
index 2d15b2a14..2d15b2a14 100644
--- a/test cases/unit/102 rlib linkage/meson.build
+++ b/test cases/unit/101 rlib linkage/meson.build
diff --git a/test cases/unit/103 python without pkgconfig/meson.build b/test cases/unit/102 python without pkgconfig/meson.build
index b3a0c42fb..b3a0c42fb 100644
--- a/test cases/unit/103 python without pkgconfig/meson.build
+++ b/test cases/unit/102 python without pkgconfig/meson.build
diff --git a/test cases/unit/104 strip/lib.c b/test cases/unit/103 strip/lib.c
index 3940fde7e..3940fde7e 100644
--- a/test cases/unit/104 strip/lib.c
+++ b/test cases/unit/103 strip/lib.c
diff --git a/test cases/unit/104 strip/meson.build b/test cases/unit/103 strip/meson.build
index dff61ab43..dff61ab43 100644
--- a/test cases/unit/104 strip/meson.build
+++ b/test cases/unit/103 strip/meson.build
diff --git a/test cases/unit/105 debug function/meson.build b/test cases/unit/104 debug function/meson.build
index c3f4c769f..c3f4c769f 100644
--- a/test cases/unit/105 debug function/meson.build
+++ b/test cases/unit/104 debug function/meson.build
diff --git a/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build b/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
index ff2128624..ff2128624 100644
--- a/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build
+++ b/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
diff --git a/test cases/unit/107 subproject symlink/cp.py b/test cases/unit/106 subproject symlink/cp.py
index adb0547b8..adb0547b8 100644
--- a/test cases/unit/107 subproject symlink/cp.py
+++ b/test cases/unit/106 subproject symlink/cp.py
diff --git a/test cases/unit/107 subproject symlink/main.c b/test cases/unit/106 subproject symlink/main.c
index 62bd4b4b2..62bd4b4b2 100644
--- a/test cases/unit/107 subproject symlink/main.c
+++ b/test cases/unit/106 subproject symlink/main.c
diff --git a/test cases/unit/107 subproject symlink/meson.build b/test cases/unit/106 subproject symlink/meson.build
index 6766c8e4a..6766c8e4a 100644
--- a/test cases/unit/107 subproject symlink/meson.build
+++ b/test cases/unit/106 subproject symlink/meson.build
diff --git a/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile b/test cases/unit/106 subproject symlink/symlinked_subproject/datadir/datafile
index 6a682940b..6a682940b 100644
--- a/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile
+++ b/test cases/unit/106 subproject symlink/symlinked_subproject/datadir/datafile
diff --git a/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build b/test cases/unit/106 subproject symlink/symlinked_subproject/datadir/meson.build
index cbeb0a969..cbeb0a969 100644
--- a/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build
+++ b/test cases/unit/106 subproject symlink/symlinked_subproject/datadir/meson.build
diff --git a/test cases/unit/107 subproject symlink/symlinked_subproject/meson.build b/test cases/unit/106 subproject symlink/symlinked_subproject/meson.build
index 39304655f..39304655f 100644
--- a/test cases/unit/107 subproject symlink/symlinked_subproject/meson.build
+++ b/test cases/unit/106 subproject symlink/symlinked_subproject/meson.build
diff --git a/test cases/unit/107 subproject symlink/symlinked_subproject/src.c b/test cases/unit/106 subproject symlink/symlinked_subproject/src.c
index 97d7ad1d6..97d7ad1d6 100644
--- a/test cases/unit/107 subproject symlink/symlinked_subproject/src.c
+++ b/test cases/unit/106 subproject symlink/symlinked_subproject/src.c
diff --git a/test cases/unit/108 new subproject on reconfigure/meson.build b/test cases/unit/107 new subproject on reconfigure/meson.build
index 7342c9a30..7342c9a30 100644
--- a/test cases/unit/108 new subproject on reconfigure/meson.build
+++ b/test cases/unit/107 new subproject on reconfigure/meson.build
diff --git a/test cases/unit/108 new subproject on reconfigure/meson_options.txt b/test cases/unit/107 new subproject on reconfigure/meson_options.txt
index b3dd68392..b3dd68392 100644
--- a/test cases/unit/108 new subproject on reconfigure/meson_options.txt
+++ b/test cases/unit/107 new subproject on reconfigure/meson_options.txt
diff --git a/test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c b/test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c
index 1edf9959c..1edf9959c 100644
--- a/test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c
+++ b/test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c
diff --git a/test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build b/test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build
index 2a6e30ad7..2a6e30ad7 100644
--- a/test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build
+++ b/test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build
diff --git a/test cases/unit/109 configure same noop/meson.build b/test cases/unit/108 configure same noop/meson.build
index d3f13262e..d3f13262e 100644
--- a/test cases/unit/109 configure same noop/meson.build
+++ b/test cases/unit/108 configure same noop/meson.build
diff --git a/test cases/unit/109 configure same noop/meson_options.txt b/test cases/unit/108 configure same noop/meson_options.txt
index c406af229..c406af229 100644
--- a/test cases/unit/109 configure same noop/meson_options.txt
+++ b/test cases/unit/108 configure same noop/meson_options.txt
diff --git a/test cases/unit/92 install skip subprojects/foo.c b/test cases/unit/91 install skip subprojects/foo.c
index 25927f5a1..25927f5a1 100644
--- a/test cases/unit/92 install skip subprojects/foo.c
+++ b/test cases/unit/91 install skip subprojects/foo.c
diff --git a/test cases/unit/92 install skip subprojects/foo.dat b/test cases/unit/91 install skip subprojects/foo.dat
index 421376db9..421376db9 100644
--- a/test cases/unit/92 install skip subprojects/foo.dat
+++ b/test cases/unit/91 install skip subprojects/foo.dat
diff --git a/test cases/unit/92 install skip subprojects/foo.h b/test cases/unit/91 install skip subprojects/foo.h
index a7e26ac6c..a7e26ac6c 100644
--- a/test cases/unit/92 install skip subprojects/foo.h
+++ b/test cases/unit/91 install skip subprojects/foo.h
diff --git a/test cases/unit/92 install skip subprojects/foo/foofile b/test cases/unit/91 install skip subprojects/foo/foofile
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/92 install skip subprojects/foo/foofile
+++ b/test cases/unit/91 install skip subprojects/foo/foofile
diff --git a/test cases/unit/92 install skip subprojects/meson.build b/test cases/unit/91 install skip subprojects/meson.build
index cfbae9483..cfbae9483 100644
--- a/test cases/unit/92 install skip subprojects/meson.build
+++ b/test cases/unit/91 install skip subprojects/meson.build
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.c b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.c
index 25927f5a1..25927f5a1 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.c
+++ b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.c
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat
index 421376db9..421376db9 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat
+++ b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.h b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.h
index a7e26ac6c..a7e26ac6c 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.h
+++ b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.h
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile b/test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile
index 421376db9..421376db9 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile
+++ b/test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/meson.build b/test cases/unit/91 install skip subprojects/subprojects/bar/meson.build
index b5b073408..b5b073408 100644
--- a/test cases/unit/92 install skip subprojects/subprojects/bar/meson.build
+++ b/test cases/unit/91 install skip subprojects/subprojects/bar/meson.build
diff --git a/test cases/unit/93 new subproject in configured project/meson.build b/test cases/unit/92 new subproject in configured project/meson.build
index b82aa4173..b82aa4173 100644
--- a/test cases/unit/93 new subproject in configured project/meson.build
+++ b/test cases/unit/92 new subproject in configured project/meson.build
diff --git a/test cases/unit/93 new subproject in configured project/meson_options.txt b/test cases/unit/92 new subproject in configured project/meson_options.txt
index 12d8395d4..12d8395d4 100644
--- a/test cases/unit/93 new subproject in configured project/meson_options.txt
+++ b/test cases/unit/92 new subproject in configured project/meson_options.txt
diff --git a/test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c b/test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c
index 9713d9f7f..9713d9f7f 100644
--- a/test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c
+++ b/test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c
diff --git a/test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build b/test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build
index a833b0c35..a833b0c35 100644
--- a/test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build
+++ b/test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build
diff --git a/test cases/unit/94 clangformat/.clang-format b/test cases/unit/93 clangformat/.clang-format
index 689bc6047..689bc6047 100644
--- a/test cases/unit/94 clangformat/.clang-format
+++ b/test cases/unit/93 clangformat/.clang-format
diff --git a/test cases/unit/94 clangformat/.clang-format-ignore b/test cases/unit/93 clangformat/.clang-format-ignore
index 7fc4d5a95..7fc4d5a95 100644
--- a/test cases/unit/94 clangformat/.clang-format-ignore
+++ b/test cases/unit/93 clangformat/.clang-format-ignore
diff --git a/test cases/unit/94 clangformat/.clang-format-include b/test cases/unit/93 clangformat/.clang-format-include
index f057c0033..f057c0033 100644
--- a/test cases/unit/94 clangformat/.clang-format-include
+++ b/test cases/unit/93 clangformat/.clang-format-include
diff --git a/test cases/unit/94 clangformat/meson.build b/test cases/unit/93 clangformat/meson.build
index 8f4af981b..8f4af981b 100644
--- a/test cases/unit/94 clangformat/meson.build
+++ b/test cases/unit/93 clangformat/meson.build
diff --git a/test cases/unit/94 clangformat/not-included/badformat.cpp b/test cases/unit/93 clangformat/not-included/badformat.cpp
index 99a0ea60c..99a0ea60c 100644
--- a/test cases/unit/94 clangformat/not-included/badformat.cpp
+++ b/test cases/unit/93 clangformat/not-included/badformat.cpp
diff --git a/test cases/unit/94 clangformat/src/badformat.c b/test cases/unit/93 clangformat/src/badformat.c
index f1d18b7ed..f1d18b7ed 100644
--- a/test cases/unit/94 clangformat/src/badformat.c
+++ b/test cases/unit/93 clangformat/src/badformat.c
diff --git a/test cases/unit/94 clangformat/src/badformat.cpp b/test cases/unit/93 clangformat/src/badformat.cpp
index 99a0ea60c..99a0ea60c 100644
--- a/test cases/unit/94 clangformat/src/badformat.cpp
+++ b/test cases/unit/93 clangformat/src/badformat.cpp
diff --git a/test cases/unit/95 custominc/easytogrepfor/genh.py b/test cases/unit/94 custominc/easytogrepfor/genh.py
index 48e033a72..48e033a72 100644
--- a/test cases/unit/95 custominc/easytogrepfor/genh.py
+++ b/test cases/unit/94 custominc/easytogrepfor/genh.py
diff --git a/test cases/unit/95 custominc/easytogrepfor/meson.build b/test cases/unit/94 custominc/easytogrepfor/meson.build
index e749753bc..e749753bc 100644
--- a/test cases/unit/95 custominc/easytogrepfor/meson.build
+++ b/test cases/unit/94 custominc/easytogrepfor/meson.build
diff --git a/test cases/unit/95 custominc/helper.c b/test cases/unit/94 custominc/helper.c
index 3237441bc..3237441bc 100644
--- a/test cases/unit/95 custominc/helper.c
+++ b/test cases/unit/94 custominc/helper.c
diff --git a/test cases/unit/95 custominc/meson.build b/test cases/unit/94 custominc/meson.build
index bab113908..bab113908 100644
--- a/test cases/unit/95 custominc/meson.build
+++ b/test cases/unit/94 custominc/meson.build
diff --git a/test cases/unit/95 custominc/prog.c b/test cases/unit/94 custominc/prog.c
index db9df9d5e..db9df9d5e 100644
--- a/test cases/unit/95 custominc/prog.c
+++ b/test cases/unit/94 custominc/prog.c
diff --git a/test cases/unit/95 custominc/prog2.c b/test cases/unit/94 custominc/prog2.c
index e64b22919..e64b22919 100644
--- a/test cases/unit/95 custominc/prog2.c
+++ b/test cases/unit/94 custominc/prog2.c
diff --git a/test cases/unit/96 implicit force fallback/meson.build b/test cases/unit/95 implicit force fallback/meson.build
index 623a338db..623a338db 100644
--- a/test cases/unit/96 implicit force fallback/meson.build
+++ b/test cases/unit/95 implicit force fallback/meson.build
diff --git a/test cases/unit/96 implicit force fallback/subprojects/something/meson.build b/test cases/unit/95 implicit force fallback/subprojects/something/meson.build
index 89a4727dc..89a4727dc 100644
--- a/test cases/unit/96 implicit force fallback/subprojects/something/meson.build
+++ b/test cases/unit/95 implicit force fallback/subprojects/something/meson.build
diff --git a/test cases/unit/97 compiler.links file arg/meson.build b/test cases/unit/96 compiler.links file arg/meson.build
index c409dcbd1..c409dcbd1 100644
--- a/test cases/unit/97 compiler.links file arg/meson.build
+++ b/test cases/unit/96 compiler.links file arg/meson.build
diff --git a/test cases/unit/97 compiler.links file arg/test.c b/test cases/unit/96 compiler.links file arg/test.c
index 78f2de106..78f2de106 100644
--- a/test cases/unit/97 compiler.links file arg/test.c
+++ b/test cases/unit/96 compiler.links file arg/test.c
diff --git a/test cases/unit/98 link full name/.gitignore b/test cases/unit/97 link full name/.gitignore
index 812960172..812960172 100644
--- a/test cases/unit/98 link full name/.gitignore
+++ b/test cases/unit/97 link full name/.gitignore
diff --git a/test cases/unit/98 link full name/libtestprovider/meson.build b/test cases/unit/97 link full name/libtestprovider/meson.build
index 128c213ac..128c213ac 100644
--- a/test cases/unit/98 link full name/libtestprovider/meson.build
+++ b/test cases/unit/97 link full name/libtestprovider/meson.build
diff --git a/test cases/unit/98 link full name/libtestprovider/provider.c b/test cases/unit/97 link full name/libtestprovider/provider.c
index 5e79966f7..5e79966f7 100644
--- a/test cases/unit/98 link full name/libtestprovider/provider.c
+++ b/test cases/unit/97 link full name/libtestprovider/provider.c
diff --git a/test cases/unit/98 link full name/proguser/meson.build b/test cases/unit/97 link full name/proguser/meson.build
index 5be5bc998..5be5bc998 100644
--- a/test cases/unit/98 link full name/proguser/meson.build
+++ b/test cases/unit/97 link full name/proguser/meson.build
diff --git a/test cases/unit/98 link full name/proguser/receiver.c b/test cases/unit/97 link full name/proguser/receiver.c
index 65e9d8ea1..65e9d8ea1 100644
--- a/test cases/unit/98 link full name/proguser/receiver.c
+++ b/test cases/unit/97 link full name/proguser/receiver.c
diff --git a/test cases/unit/99 install all targets/bar-custom.txt b/test cases/unit/98 install all targets/bar-custom.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/bar-custom.txt
+++ b/test cases/unit/98 install all targets/bar-custom.txt
diff --git a/test cases/unit/99 install all targets/bar-devel.h b/test cases/unit/98 install all targets/bar-devel.h
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/bar-devel.h
+++ b/test cases/unit/98 install all targets/bar-devel.h
diff --git a/test cases/unit/99 install all targets/bar-notag.txt b/test cases/unit/98 install all targets/bar-notag.txt
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/bar-notag.txt
+++ b/test cases/unit/98 install all targets/bar-notag.txt
diff --git a/test cases/unit/99 install all targets/custom_files/data.txt b/test cases/unit/98 install all targets/custom_files/data.txt
index 557db03de..557db03de 100644
--- a/test cases/unit/99 install all targets/custom_files/data.txt
+++ b/test cases/unit/98 install all targets/custom_files/data.txt
diff --git a/test cases/unit/99 install all targets/foo.in b/test cases/unit/98 install all targets/foo.in
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/foo.in
+++ b/test cases/unit/98 install all targets/foo.in
diff --git a/test cases/unit/99 install all targets/foo1-devel.h b/test cases/unit/98 install all targets/foo1-devel.h
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/foo1-devel.h
+++ b/test cases/unit/98 install all targets/foo1-devel.h
diff --git a/test cases/unit/99 install all targets/lib.c b/test cases/unit/98 install all targets/lib.c
index 2ea9c7dd1..2ea9c7dd1 100644
--- a/test cases/unit/99 install all targets/lib.c
+++ b/test cases/unit/98 install all targets/lib.c
diff --git a/test cases/unit/99 install all targets/main.c b/test cases/unit/98 install all targets/main.c
index 0fb4389f7..0fb4389f7 100644
--- a/test cases/unit/99 install all targets/main.c
+++ b/test cases/unit/98 install all targets/main.c
diff --git a/test cases/unit/99 install all targets/meson.build b/test cases/unit/98 install all targets/meson.build
index c90632aa6..c90632aa6 100644
--- a/test cases/unit/99 install all targets/meson.build
+++ b/test cases/unit/98 install all targets/meson.build
diff --git a/test cases/unit/99 install all targets/script.py b/test cases/unit/98 install all targets/script.py
index c5f3be9ed..c5f3be9ed 100644
--- a/test cases/unit/99 install all targets/script.py
+++ b/test cases/unit/98 install all targets/script.py
diff --git a/test cases/unit/99 install all targets/subdir/bar2-devel.h b/test cases/unit/98 install all targets/subdir/bar2-devel.h
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/subdir/bar2-devel.h
+++ b/test cases/unit/98 install all targets/subdir/bar2-devel.h
diff --git a/test cases/unit/99 install all targets/subdir/foo2.in b/test cases/unit/98 install all targets/subdir/foo2.in
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/subdir/foo2.in
+++ b/test cases/unit/98 install all targets/subdir/foo2.in
diff --git a/test cases/unit/99 install all targets/subdir/foo3-devel.h b/test cases/unit/98 install all targets/subdir/foo3-devel.h
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/99 install all targets/subdir/foo3-devel.h
+++ b/test cases/unit/98 install all targets/subdir/foo3-devel.h
diff --git a/test cases/unit/99 install all targets/subdir/lib.c b/test cases/unit/98 install all targets/subdir/lib.c
index 2ea9c7dd1..2ea9c7dd1 100644
--- a/test cases/unit/99 install all targets/subdir/lib.c
+++ b/test cases/unit/98 install all targets/subdir/lib.c
diff --git a/test cases/unit/99 install all targets/subdir/main.c b/test cases/unit/98 install all targets/subdir/main.c
index 0fb4389f7..0fb4389f7 100644
--- a/test cases/unit/99 install all targets/subdir/main.c
+++ b/test cases/unit/98 install all targets/subdir/main.c
diff --git a/test cases/unit/99 install all targets/subdir/meson.build b/test cases/unit/98 install all targets/subdir/meson.build
index 53c796abe..53c796abe 100644
--- a/test cases/unit/99 install all targets/subdir/meson.build
+++ b/test cases/unit/98 install all targets/subdir/meson.build
diff --git a/test cases/unit/99 install all targets/subdir/script.py b/test cases/unit/98 install all targets/subdir/script.py
index c5f3be9ed..c5f3be9ed 100644
--- a/test cases/unit/99 install all targets/subdir/script.py
+++ b/test cases/unit/98 install all targets/subdir/script.py
diff --git a/test cases/unit/100 custom target name/file.txt.in b/test cases/unit/99 custom target name/file.txt.in
index e69de29bb..e69de29bb 100644
--- a/test cases/unit/100 custom target name/file.txt.in
+++ b/test cases/unit/99 custom target name/file.txt.in
diff --git a/test cases/unit/100 custom target name/meson.build b/test cases/unit/99 custom target name/meson.build
index 8d148a88d..8d148a88d 100644
--- a/test cases/unit/100 custom target name/meson.build
+++ b/test cases/unit/99 custom target name/meson.build
diff --git a/test cases/unit/100 custom target name/subdir/meson.build b/test cases/unit/99 custom target name/subdir/meson.build
index 785a7b366..785a7b366 100644
--- a/test cases/unit/100 custom target name/subdir/meson.build
+++ b/test cases/unit/99 custom target name/subdir/meson.build
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 0cc1706d9..d90153c0f 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -542,7 +542,7 @@ class AllPlatformTests(BasePlatformTests):
         self.run_tests()
 
     def test_implicit_forcefallback(self):
-        testdir = os.path.join(self.unit_test_dir, '96 implicit force fallback')
+        testdir = os.path.join(self.unit_test_dir, '95 implicit force fallback')
         with self.assertRaises(subprocess.CalledProcessError):
             self.init(testdir)
         self.init(testdir, extra_args=['--wrap-mode=forcefallback'])
@@ -581,7 +581,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertIn('1/1 subtest 1', out)
 
     def test_long_output(self):
-        testdir = os.path.join(self.common_test_dir, '253 long output')
+        testdir = os.path.join(self.common_test_dir, '254 long output')
         self.init(testdir)
         self.build()
         self.run_tests()
@@ -1749,7 +1749,7 @@ class AllPlatformTests(BasePlatformTests):
         check_pcfile('libvartest2.pc', relocatable=False)
 
         self.wipe()
-        testdir_abs = os.path.join(self.unit_test_dir, '106 pkgconfig relocatable with absolute path')
+        testdir_abs = os.path.join(self.unit_test_dir, '105 pkgconfig relocatable with absolute path')
         self.init(testdir_abs)
 
         check_pcfile('libsimple.pc', relocatable=True, levels=3)
@@ -2112,7 +2112,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertIn(msg, out)
 
     def test_mixed_language_linker_check(self):
-        testdir = os.path.join(self.unit_test_dir, '97 compiler.links file arg')
+        testdir = os.path.join(self.unit_test_dir, '96 compiler.links file arg')
         self.init(testdir)
         cmds = self.get_meson_log_compiler_checks()
         self.assertEqual(len(cmds), 5)
@@ -3878,7 +3878,7 @@ class AllPlatformTests(BasePlatformTests):
         self.init(srcdir, extra_args=['-Dbuild.b_lto=true'])
 
     def test_install_skip_subprojects(self):
-        testdir = os.path.join(self.unit_test_dir, '92 install skip subprojects')
+        testdir = os.path.join(self.unit_test_dir, '91 install skip subprojects')
         self.init(testdir)
         self.build()
 
@@ -3924,7 +3924,7 @@ class AllPlatformTests(BasePlatformTests):
         check_installed_files(['--skip-subprojects', 'another'], all_expected)
 
     def test_adding_subproject_to_configure_project(self) -> None:
-        srcdir = os.path.join(self.unit_test_dir, '93 new subproject in configured project')
+        srcdir = os.path.join(self.unit_test_dir, '92 new subproject in configured project')
         self.init(srcdir)
         self.build()
         self.setconf('-Duse-sub=true')
@@ -3947,7 +3947,7 @@ class AllPlatformTests(BasePlatformTests):
         if not shutil.which('clang-format'):
             raise SkipTest('clang-format not found')
 
-        testdir = os.path.join(self.unit_test_dir, '94 clangformat')
+        testdir = os.path.join(self.unit_test_dir, '93 clangformat')
         newdir = os.path.join(self.builddir, 'testdir')
         shutil.copytree(testdir, newdir)
         self.new_builddir()
@@ -3972,7 +3972,7 @@ class AllPlatformTests(BasePlatformTests):
         self.build('clang-format-check')
 
     def test_custom_target_implicit_include(self):
-        testdir = os.path.join(self.unit_test_dir, '95 custominc')
+        testdir = os.path.join(self.unit_test_dir, '94 custominc')
         self.init(testdir)
         self.build()
         compdb = self.get_compdb()
@@ -4012,7 +4012,7 @@ class AllPlatformTests(BasePlatformTests):
                 self.assertEqual(sorted(link_args), sorted(['-flto']))
 
     def test_install_tag(self) -> None:
-        testdir = os.path.join(self.unit_test_dir, '99 install all targets')
+        testdir = os.path.join(self.unit_test_dir, '98 install all targets')
         self.init(testdir)
         self.build()
 
@@ -4159,7 +4159,7 @@ class AllPlatformTests(BasePlatformTests):
         do_install(None, expected_all, 2)
 
     def test_introspect_install_plan(self):
-        testdir = os.path.join(self.unit_test_dir, '99 install all targets')
+        testdir = os.path.join(self.unit_test_dir, '98 install all targets')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-install_plan.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -4361,7 +4361,7 @@ class AllPlatformTests(BasePlatformTests):
                 }}
             ''')
 
-        testdir = os.path.join(self.unit_test_dir, '102 rlib linkage')
+        testdir = os.path.join(self.unit_test_dir, '101 rlib linkage')
         gen_file = os.path.join(testdir, 'lib.rs')
         with open(gen_file, 'w') as f:
             f.write(template.format(0))
@@ -4381,7 +4381,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertIn('exit status 39', cm.exception.stdout)
 
     def test_custom_target_name(self):
-        testdir = os.path.join(self.unit_test_dir, '100 custom target name')
+        testdir = os.path.join(self.unit_test_dir, '99 custom target name')
         self.init(testdir)
         out = self.build()
         if self.backend is Backend.ninja:
@@ -4389,7 +4389,7 @@ class AllPlatformTests(BasePlatformTests):
             self.assertIn('Generating subdir/file.txt with a custom command', out)
 
     def test_symlinked_subproject(self):
-        testdir = os.path.join(self.unit_test_dir, '107 subproject symlink')
+        testdir = os.path.join(self.unit_test_dir, '106 subproject symlink')
         subproject_dir = os.path.join(testdir, 'subprojects')
         subproject = os.path.join(testdir, 'symlinked_subproject')
         symlinked_subproject = os.path.join(testdir, 'subprojects', 'symlinked_subproject')
@@ -4402,7 +4402,7 @@ class AllPlatformTests(BasePlatformTests):
         self.build()
 
     def test_configure_same_noop(self):
-        testdir = os.path.join(self.unit_test_dir, '109 configure same noop')
+        testdir = os.path.join(self.unit_test_dir, '108 configure same noop')
         self.init(testdir, extra_args=['-Dopt=val'])
 
         filename = os.path.join(self.privatedir, 'coredata.dat')
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index 7de321480..357e42001 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -1350,7 +1350,7 @@ class LinuxlikeTests(BasePlatformTests):
         see: https://github.com/mesonbuild/meson/issues/9000
              https://stackoverflow.com/questions/48532868/gcc-library-option-with-a-colon-llibevent-a
         '''
-        testdir = os.path.join(self.unit_test_dir, '98 link full name','libtestprovider')
+        testdir = os.path.join(self.unit_test_dir, '97 link full name','libtestprovider')
         oldprefix = self.prefix
         # install into installdir without using DESTDIR
         installdir = self.installdir
@@ -1363,7 +1363,7 @@ class LinuxlikeTests(BasePlatformTests):
         self.new_builddir()
         env = {'LIBRARY_PATH': os.path.join(installdir, self.libdir),
                'PKG_CONFIG_PATH': _prepend_pkg_config_path(os.path.join(installdir, self.libdir, 'pkgconfig'))}
-        testdir = os.path.join(self.unit_test_dir, '98 link full name','proguser')
+        testdir = os.path.join(self.unit_test_dir, '97 link full name','proguser')
         self.init(testdir,override_envvars=env)
 
         # test for link with full path
@@ -1775,7 +1775,7 @@ class LinuxlikeTests(BasePlatformTests):
 
     @skipUnless(is_linux(), 'Test only applicable to Linux')
     def test_install_strip(self):
-        testdir = os.path.join(self.unit_test_dir, '104 strip')
+        testdir = os.path.join(self.unit_test_dir, '103 strip')
         self.init(testdir)
         self.build()
 
diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py
index ed5d96b8a..fc404422c 100644
--- a/unittests/platformagnostictests.py
+++ b/unittests/platformagnostictests.py
@@ -35,7 +35,7 @@ class PlatformAgnosticTests(BasePlatformTests):
         Tests that find_program() with a relative path does not find the program
         in current workdir.
         '''
-        testdir = os.path.join(self.unit_test_dir, '101 relative find program')
+        testdir = os.path.join(self.unit_test_dir, '100 relative find program')
         self.init(testdir, workdir=testdir)
 
     def test_invalid_option_names(self):
@@ -71,11 +71,11 @@ class PlatformAgnosticTests(BasePlatformTests):
         interp.process(fname)
 
     def test_python_dependency_without_pkgconfig(self):
-        testdir = os.path.join(self.unit_test_dir, '103 python without pkgconfig')
+        testdir = os.path.join(self.unit_test_dir, '102 python without pkgconfig')
         self.init(testdir, override_envvars={'PKG_CONFIG': 'notfound'})
 
     def test_debug_function_outputs_to_meson_log(self):
-        testdir = os.path.join(self.unit_test_dir, '105 debug function')
+        testdir = os.path.join(self.unit_test_dir, '104 debug function')
         log_msg = 'This is an example debug output, should only end up in debug log'
         output = self.init(testdir)
 
@@ -88,7 +88,7 @@ class PlatformAgnosticTests(BasePlatformTests):
             self.assertIn(log_msg, file.read())
 
     def test_new_subproject_reconfigure(self):
-        testdir = os.path.join(self.unit_test_dir, '108 new subproject on reconfigure')
+        testdir = os.path.join(self.unit_test_dir, '107 new subproject on reconfigure')
         self.init(testdir)
         self.build()