Condense test directories for rc.
diff --git a/test cases/common/278 expected exitcode/failing.c b/test cases/common/279 expected exitcode/failing.c
similarity index 100%
rename from test cases/common/278 expected exitcode/failing.c
rename to test cases/common/279 expected exitcode/failing.c
diff --git a/test cases/common/278 expected exitcode/meson.build b/test cases/common/279 expected exitcode/meson.build
similarity index 100%
rename from test cases/common/278 expected exitcode/meson.build
rename to test cases/common/279 expected exitcode/meson.build
diff --git a/test cases/common/279 pkgconfig override/meson.build b/test cases/common/280 pkgconfig override/meson.build
similarity index 100%
rename from test cases/common/279 pkgconfig override/meson.build
rename to test cases/common/280 pkgconfig override/meson.build
diff --git a/test cases/common/279 pkgconfig override/subprojects/pkg-config.wrap b/test cases/common/280 pkgconfig override/subprojects/pkg-config.wrap
similarity index 100%
rename from test cases/common/279 pkgconfig override/subprojects/pkg-config.wrap
rename to test cases/common/280 pkgconfig override/subprojects/pkg-config.wrap
diff --git a/test cases/common/279 pkgconfig override/subprojects/pkg-config/bin/pkg-config.py b/test cases/common/280 pkgconfig override/subprojects/pkg-config/bin/pkg-config.py
similarity index 100%
rename from test cases/common/279 pkgconfig override/subprojects/pkg-config/bin/pkg-config.py
rename to test cases/common/280 pkgconfig override/subprojects/pkg-config/bin/pkg-config.py
diff --git a/test cases/common/279 pkgconfig override/subprojects/pkg-config/meson.build b/test cases/common/280 pkgconfig override/subprojects/pkg-config/meson.build
similarity index 100%
rename from test cases/common/279 pkgconfig override/subprojects/pkg-config/meson.build
rename to test cases/common/280 pkgconfig override/subprojects/pkg-config/meson.build
diff --git a/test cases/common/280 pkgconfig-gen/meson.build b/test cases/common/281 pkgconfig-gen/meson.build
similarity index 100%
rename from test cases/common/280 pkgconfig-gen/meson.build
rename to test cases/common/281 pkgconfig-gen/meson.build
diff --git a/test cases/common/280 pkgconfig-gen/simple.c b/test cases/common/281 pkgconfig-gen/simple.c
similarity index 100%
rename from test cases/common/280 pkgconfig-gen/simple.c
rename to test cases/common/281 pkgconfig-gen/simple.c
diff --git a/test cases/common/280 pkgconfig-gen/simple.h b/test cases/common/281 pkgconfig-gen/simple.h
similarity index 100%
rename from test cases/common/280 pkgconfig-gen/simple.h
rename to test cases/common/281 pkgconfig-gen/simple.h
diff --git a/test cases/common/280 pkgconfig-gen/simple2/exports.def b/test cases/common/281 pkgconfig-gen/simple2/exports.def
similarity index 100%
rename from test cases/common/280 pkgconfig-gen/simple2/exports.def
rename to test cases/common/281 pkgconfig-gen/simple2/exports.def
diff --git a/test cases/common/280 pkgconfig-gen/simple2/meson.build b/test cases/common/281 pkgconfig-gen/simple2/meson.build
similarity index 100%
rename from test cases/common/280 pkgconfig-gen/simple2/meson.build
rename to test cases/common/281 pkgconfig-gen/simple2/meson.build
diff --git a/test cases/common/280 pkgconfig-gen/simple2/simple2.c b/test cases/common/281 pkgconfig-gen/simple2/simple2.c
similarity index 100%
rename from test cases/common/280 pkgconfig-gen/simple2/simple2.c
rename to test cases/common/281 pkgconfig-gen/simple2/simple2.c
diff --git a/test cases/common/280 pkgconfig-gen/simple2/simple2.h b/test cases/common/281 pkgconfig-gen/simple2/simple2.h
similarity index 100%
rename from test cases/common/280 pkgconfig-gen/simple2/simple2.h
rename to test cases/common/281 pkgconfig-gen/simple2/simple2.h
diff --git a/test cases/common/280 pkgconfig-gen/test.json b/test cases/common/281 pkgconfig-gen/test.json
similarity index 100%
rename from test cases/common/280 pkgconfig-gen/test.json
rename to test cases/common/281 pkgconfig-gen/test.json
diff --git a/test cases/common/281 -D_FORTIFY_SOURCE=2 and -O0/meson.build b/test cases/common/282 -D_FORTIFY_SOURCE=2 and -O0/meson.build
similarity index 100%
rename from test cases/common/281 -D_FORTIFY_SOURCE=2 and -O0/meson.build
rename to test cases/common/282 -D_FORTIFY_SOURCE=2 and -O0/meson.build
diff --git a/test cases/common/281 -D_FORTIFY_SOURCE=2 and -O0/test.json b/test cases/common/282 -D_FORTIFY_SOURCE=2 and -O0/test.json
similarity index 100%
rename from test cases/common/281 -D_FORTIFY_SOURCE=2 and -O0/test.json
rename to test cases/common/282 -D_FORTIFY_SOURCE=2 and -O0/test.json
diff --git a/test cases/common/281 subproj options/crossfile.ini b/test cases/common/283 subproj options/crossfile.ini
similarity index 100%
rename from test cases/common/281 subproj options/crossfile.ini
rename to test cases/common/283 subproj options/crossfile.ini
diff --git a/test cases/common/281 subproj options/meson.build b/test cases/common/283 subproj options/meson.build
similarity index 100%
rename from test cases/common/281 subproj options/meson.build
rename to test cases/common/283 subproj options/meson.build
diff --git a/test cases/common/281 subproj options/subprojects/sub/meson.build b/test cases/common/283 subproj options/subprojects/sub/meson.build
similarity index 100%
rename from test cases/common/281 subproj options/subprojects/sub/meson.build
rename to test cases/common/283 subproj options/subprojects/sub/meson.build
diff --git a/test cases/common/281 subproj options/subprojects/sub/meson_options.txt b/test cases/common/283 subproj options/subprojects/sub/meson_options.txt
similarity index 100%
rename from test cases/common/281 subproj options/subprojects/sub/meson_options.txt
rename to test cases/common/283 subproj options/subprojects/sub/meson_options.txt
diff --git a/test cases/common/281 subproj options/subprojects/sub2/f.c b/test cases/common/283 subproj options/subprojects/sub2/f.c
similarity index 100%
rename from test cases/common/281 subproj options/subprojects/sub2/f.c
rename to test cases/common/283 subproj options/subprojects/sub2/f.c
diff --git a/test cases/common/281 subproj options/subprojects/sub2/meson.build b/test cases/common/283 subproj options/subprojects/sub2/meson.build
similarity index 100%
rename from test cases/common/281 subproj options/subprojects/sub2/meson.build
rename to test cases/common/283 subproj options/subprojects/sub2/meson.build
diff --git a/test cases/common/281 subproj options/subprojects/sub2/meson_options.txt b/test cases/common/283 subproj options/subprojects/sub2/meson_options.txt
similarity index 100%
rename from test cases/common/281 subproj options/subprojects/sub2/meson_options.txt
rename to test cases/common/283 subproj options/subprojects/sub2/meson_options.txt
diff --git a/test cases/common/281 subproj options/test.json b/test cases/common/283 subproj options/test.json
similarity index 100%
rename from test cases/common/281 subproj options/test.json
rename to test cases/common/283 subproj options/test.json
diff --git a/test cases/common/282 test args and depends in path/libs/a/lib_a.c b/test cases/common/284 test args and depends in path/libs/a/lib_a.c
similarity index 100%
rename from test cases/common/282 test args and depends in path/libs/a/lib_a.c
rename to test cases/common/284 test args and depends in path/libs/a/lib_a.c
diff --git a/test cases/common/282 test args and depends in path/libs/a/lib_a.def b/test cases/common/284 test args and depends in path/libs/a/lib_a.def
similarity index 100%
rename from test cases/common/282 test args and depends in path/libs/a/lib_a.def
rename to test cases/common/284 test args and depends in path/libs/a/lib_a.def
diff --git a/test cases/common/282 test args and depends in path/libs/a/meson.build b/test cases/common/284 test args and depends in path/libs/a/meson.build
similarity index 100%
rename from test cases/common/282 test args and depends in path/libs/a/meson.build
rename to test cases/common/284 test args and depends in path/libs/a/meson.build
diff --git a/test cases/common/282 test args and depends in path/libs/b/lib_b.c b/test cases/common/284 test args and depends in path/libs/b/lib_b.c
similarity index 100%
rename from test cases/common/282 test args and depends in path/libs/b/lib_b.c
rename to test cases/common/284 test args and depends in path/libs/b/lib_b.c
diff --git a/test cases/common/282 test args and depends in path/libs/b/lib_b.def b/test cases/common/284 test args and depends in path/libs/b/lib_b.def
similarity index 100%
rename from test cases/common/282 test args and depends in path/libs/b/lib_b.def
rename to test cases/common/284 test args and depends in path/libs/b/lib_b.def
diff --git a/test cases/common/282 test args and depends in path/libs/b/meson.build b/test cases/common/284 test args and depends in path/libs/b/meson.build
similarity index 100%
rename from test cases/common/282 test args and depends in path/libs/b/meson.build
rename to test cases/common/284 test args and depends in path/libs/b/meson.build
diff --git a/test cases/common/282 test args and depends in path/libs/meson.build b/test cases/common/284 test args and depends in path/libs/meson.build
similarity index 100%
rename from test cases/common/282 test args and depends in path/libs/meson.build
rename to test cases/common/284 test args and depends in path/libs/meson.build
diff --git a/test cases/common/282 test args and depends in path/meson.build b/test cases/common/284 test args and depends in path/meson.build
similarity index 100%
rename from test cases/common/282 test args and depends in path/meson.build
rename to test cases/common/284 test args and depends in path/meson.build
diff --git a/test cases/common/282 test args and depends in path/test.c b/test cases/common/284 test args and depends in path/test.c
similarity index 100%
rename from test cases/common/282 test args and depends in path/test.c
rename to test cases/common/284 test args and depends in path/test.c
diff --git a/test cases/common/283 wrap override/meson.build b/test cases/common/285 wrap override/meson.build
similarity index 100%
rename from test cases/common/283 wrap override/meson.build
rename to test cases/common/285 wrap override/meson.build
diff --git a/test cases/common/283 wrap override/subprojects/sub/meson.build b/test cases/common/285 wrap override/subprojects/sub/meson.build
similarity index 100%
rename from test cases/common/283 wrap override/subprojects/sub/meson.build
rename to test cases/common/285 wrap override/subprojects/sub/meson.build
diff --git a/test cases/common/283 wrap override/subprojects/sub/subprojects/subsub.wrap b/test cases/common/285 wrap override/subprojects/sub/subprojects/subsub.wrap
similarity index 100%
rename from test cases/common/283 wrap override/subprojects/sub/subprojects/subsub.wrap
rename to test cases/common/285 wrap override/subprojects/sub/subprojects/subsub.wrap
diff --git a/test cases/common/283 wrap override/subprojects/subsub/meson.build b/test cases/common/285 wrap override/subprojects/subsub/meson.build
similarity index 100%
rename from test cases/common/283 wrap override/subprojects/subsub/meson.build
rename to test cases/common/285 wrap override/subprojects/subsub/meson.build
diff --git a/test cases/common/284 pkgconfig subproject/meson.build b/test cases/common/286 pkgconfig subproject/meson.build
similarity index 100%
rename from test cases/common/284 pkgconfig subproject/meson.build
rename to test cases/common/286 pkgconfig subproject/meson.build
diff --git a/test cases/common/284 pkgconfig subproject/simple.c b/test cases/common/286 pkgconfig subproject/simple.c
similarity index 100%
rename from test cases/common/284 pkgconfig subproject/simple.c
rename to test cases/common/286 pkgconfig subproject/simple.c
diff --git a/test cases/common/284 pkgconfig subproject/simple.h b/test cases/common/286 pkgconfig subproject/simple.h
similarity index 100%
rename from test cases/common/284 pkgconfig subproject/simple.h
rename to test cases/common/286 pkgconfig subproject/simple.h
diff --git a/test cases/common/284 pkgconfig subproject/subprojects/simple2/exports.def b/test cases/common/286 pkgconfig subproject/subprojects/simple2/exports.def
similarity index 100%
rename from test cases/common/284 pkgconfig subproject/subprojects/simple2/exports.def
rename to test cases/common/286 pkgconfig subproject/subprojects/simple2/exports.def
diff --git a/test cases/common/284 pkgconfig subproject/subprojects/simple2/meson.build b/test cases/common/286 pkgconfig subproject/subprojects/simple2/meson.build
similarity index 100%
rename from test cases/common/284 pkgconfig subproject/subprojects/simple2/meson.build
rename to test cases/common/286 pkgconfig subproject/subprojects/simple2/meson.build
diff --git a/test cases/common/284 pkgconfig subproject/subprojects/simple2/simple2.c b/test cases/common/286 pkgconfig subproject/subprojects/simple2/simple2.c
similarity index 100%
rename from test cases/common/284 pkgconfig subproject/subprojects/simple2/simple2.c
rename to test cases/common/286 pkgconfig subproject/subprojects/simple2/simple2.c
diff --git a/test cases/common/284 pkgconfig subproject/subprojects/simple2/simple2.h b/test cases/common/286 pkgconfig subproject/subprojects/simple2/simple2.h
similarity index 100%
rename from test cases/common/284 pkgconfig subproject/subprojects/simple2/simple2.h
rename to test cases/common/286 pkgconfig subproject/subprojects/simple2/simple2.h
diff --git a/test cases/common/284 pkgconfig subproject/test.json b/test cases/common/286 pkgconfig subproject/test.json
similarity index 100%
rename from test cases/common/284 pkgconfig subproject/test.json
rename to test cases/common/286 pkgconfig subproject/test.json
diff --git a/test cases/common/285 atomic/a.c b/test cases/common/287 atomic/a.c
similarity index 100%
rename from test cases/common/285 atomic/a.c
rename to test cases/common/287 atomic/a.c
diff --git a/test cases/common/285 atomic/meson.build b/test cases/common/287 atomic/meson.build
similarity index 100%
rename from test cases/common/285 atomic/meson.build
rename to test cases/common/287 atomic/meson.build
diff --git a/test cases/common/286 importstd/meson.build b/test cases/common/288 importstd/meson.build
similarity index 100%
rename from test cases/common/286 importstd/meson.build
rename to test cases/common/288 importstd/meson.build
diff --git a/test cases/common/286 importstd/useistd.cpp b/test cases/common/288 importstd/useistd.cpp
similarity index 100%
rename from test cases/common/286 importstd/useistd.cpp
rename to test cases/common/288 importstd/useistd.cpp
diff --git a/test cases/common/287 invalid dependency arguments/lib.c b/test cases/common/289 invalid dependency arguments/lib.c
similarity index 100%
rename from test cases/common/287 invalid dependency arguments/lib.c
rename to test cases/common/289 invalid dependency arguments/lib.c
diff --git a/test cases/common/287 invalid dependency arguments/main.c b/test cases/common/289 invalid dependency arguments/main.c
similarity index 100%
rename from test cases/common/287 invalid dependency arguments/main.c
rename to test cases/common/289 invalid dependency arguments/main.c
diff --git a/test cases/common/287 invalid dependency arguments/meson.build b/test cases/common/289 invalid dependency arguments/meson.build
similarity index 100%
rename from test cases/common/287 invalid dependency arguments/meson.build
rename to test cases/common/289 invalid dependency arguments/meson.build
diff --git a/test cases/common/287 invalid dependency arguments/subprojects/sub/meson.build b/test cases/common/289 invalid dependency arguments/subprojects/sub/meson.build
similarity index 100%
rename from test cases/common/287 invalid dependency arguments/subprojects/sub/meson.build
rename to test cases/common/289 invalid dependency arguments/subprojects/sub/meson.build
diff --git a/test cases/common/288 multiple provides/meson.build b/test cases/common/290 multiple provides/meson.build
similarity index 100%
rename from test cases/common/288 multiple provides/meson.build
rename to test cases/common/290 multiple provides/meson.build
diff --git a/test cases/common/288 multiple provides/subprojects/libfoobar/meson.build b/test cases/common/290 multiple provides/subprojects/libfoobar/meson.build
similarity index 100%
rename from test cases/common/288 multiple provides/subprojects/libfoobar/meson.build
rename to test cases/common/290 multiple provides/subprojects/libfoobar/meson.build
diff --git a/test cases/common/288 multiple provides/subprojects/subproject/meson.build b/test cases/common/290 multiple provides/subprojects/subproject/meson.build
similarity index 100%
rename from test cases/common/288 multiple provides/subprojects/subproject/meson.build
rename to test cases/common/290 multiple provides/subprojects/subproject/meson.build
diff --git a/test cases/common/288 multiple provides/subprojects/subproject/subprojects/test-subproject.wrap b/test cases/common/290 multiple provides/subprojects/subproject/subprojects/test-subproject.wrap
similarity index 100%
rename from test cases/common/288 multiple provides/subprojects/subproject/subprojects/test-subproject.wrap
rename to test cases/common/290 multiple provides/subprojects/subproject/subprojects/test-subproject.wrap
diff --git a/test cases/common/288 multiple provides/subprojects/test.wrap b/test cases/common/290 multiple provides/subprojects/test.wrap
similarity index 100%
rename from test cases/common/288 multiple provides/subprojects/test.wrap
rename to test cases/common/290 multiple provides/subprojects/test.wrap
diff --git a/test cases/common/289 subproject with foreign lang/intlib.cpp b/test cases/common/291 subproject with foreign lang/intlib.cpp
similarity index 100%
rename from test cases/common/289 subproject with foreign lang/intlib.cpp
rename to test cases/common/291 subproject with foreign lang/intlib.cpp
diff --git a/test cases/common/289 subproject with foreign lang/meson.build b/test cases/common/291 subproject with foreign lang/meson.build
similarity index 100%
rename from test cases/common/289 subproject with foreign lang/meson.build
rename to test cases/common/291 subproject with foreign lang/meson.build
diff --git a/test cases/common/289 subproject with foreign lang/p2test.cpp b/test cases/common/291 subproject with foreign lang/p2test.cpp
similarity index 100%
rename from test cases/common/289 subproject with foreign lang/p2test.cpp
rename to test cases/common/291 subproject with foreign lang/p2test.cpp
diff --git a/test cases/common/289 subproject with foreign lang/subprojects/pcre2/meson.build b/test cases/common/291 subproject with foreign lang/subprojects/pcre2/meson.build
similarity index 100%
rename from test cases/common/289 subproject with foreign lang/subprojects/pcre2/meson.build
rename to test cases/common/291 subproject with foreign lang/subprojects/pcre2/meson.build
diff --git a/test cases/common/289 subproject with foreign lang/subprojects/pcre2/pcre.c b/test cases/common/291 subproject with foreign lang/subprojects/pcre2/pcre.c
similarity index 100%
rename from test cases/common/289 subproject with foreign lang/subprojects/pcre2/pcre.c
rename to test cases/common/291 subproject with foreign lang/subprojects/pcre2/pcre.c
diff --git a/test cases/common/289 subproject with foreign lang/test.json b/test cases/common/291 subproject with foreign lang/test.json
similarity index 100%
rename from test cases/common/289 subproject with foreign lang/test.json
rename to test cases/common/291 subproject with foreign lang/test.json
diff --git a/test cases/common/290 link early args/cpplib.cpp b/test cases/common/292 link early args/cpplib.cpp
similarity index 100%
rename from test cases/common/290 link early args/cpplib.cpp
rename to test cases/common/292 link early args/cpplib.cpp
diff --git a/test cases/common/290 link early args/cpplib.h b/test cases/common/292 link early args/cpplib.h
similarity index 100%
rename from test cases/common/290 link early args/cpplib.h
rename to test cases/common/292 link early args/cpplib.h
diff --git a/test cases/common/290 link early args/cppmain.cpp b/test cases/common/292 link early args/cppmain.cpp
similarity index 100%
rename from test cases/common/290 link early args/cppmain.cpp
rename to test cases/common/292 link early args/cppmain.cpp
diff --git a/test cases/common/290 link early args/libfile.c b/test cases/common/292 link early args/libfile.c
similarity index 100%
rename from test cases/common/290 link early args/libfile.c
rename to test cases/common/292 link early args/libfile.c
diff --git a/test cases/common/290 link early args/main.c b/test cases/common/292 link early args/main.c
similarity index 100%
rename from test cases/common/290 link early args/main.c
rename to test cases/common/292 link early args/main.c
diff --git a/test cases/common/290 link early args/meson.build b/test cases/common/292 link early args/meson.build
similarity index 100%
rename from test cases/common/290 link early args/meson.build
rename to test cases/common/292 link early args/meson.build
diff --git a/test cases/common/290 link early args/test.json b/test cases/common/292 link early args/test.json
similarity index 100%
rename from test cases/common/290 link early args/test.json
rename to test cases/common/292 link early args/test.json
diff --git a/test cases/common/290 systemd regression/keyctl.c b/test cases/common/293 systemd regression/keyctl.c
similarity index 100%
rename from test cases/common/290 systemd regression/keyctl.c
rename to test cases/common/293 systemd regression/keyctl.c
diff --git a/test cases/common/290 systemd regression/meson.build b/test cases/common/293 systemd regression/meson.build
similarity index 100%
rename from test cases/common/290 systemd regression/meson.build
rename to test cases/common/293 systemd regression/meson.build
diff --git a/test cases/common/290 systemd regression/override/linux/keyctl.h b/test cases/common/293 systemd regression/override/linux/keyctl.h
similarity index 100%
rename from test cases/common/290 systemd regression/override/linux/keyctl.h
rename to test cases/common/293 systemd regression/override/linux/keyctl.h
diff --git a/test cases/common/290 systemd regression/override/sys/keyctl.h b/test cases/common/293 systemd regression/override/sys/keyctl.h
similarity index 100%
rename from test cases/common/290 systemd regression/override/sys/keyctl.h
rename to test cases/common/293 systemd regression/override/sys/keyctl.h
diff --git a/test cases/common/290 systemd regression/test.json b/test cases/common/293 systemd regression/test.json
similarity index 100%
rename from test cases/common/290 systemd regression/test.json
rename to test cases/common/293 systemd regression/test.json
diff --git a/test cases/common/290 systemd regression/uapi/linux/keyctl.h b/test cases/common/293 systemd regression/uapi/linux/keyctl.h
similarity index 100%
rename from test cases/common/290 systemd regression/uapi/linux/keyctl.h
rename to test cases/common/293 systemd regression/uapi/linux/keyctl.h
diff --git a/test cases/common/291 source set if_false deps/a.c b/test cases/common/294 source set if_false deps/a.c
similarity index 100%
rename from test cases/common/291 source set if_false deps/a.c
rename to test cases/common/294 source set if_false deps/a.c
diff --git a/test cases/common/291 source set if_false deps/all.h b/test cases/common/294 source set if_false deps/all.h
similarity index 100%
rename from test cases/common/291 source set if_false deps/all.h
rename to test cases/common/294 source set if_false deps/all.h
diff --git a/test cases/common/291 source set if_false deps/b.c b/test cases/common/294 source set if_false deps/b.c
similarity index 100%
rename from test cases/common/291 source set if_false deps/b.c
rename to test cases/common/294 source set if_false deps/b.c
diff --git a/test cases/common/291 source set if_false deps/main.c b/test cases/common/294 source set if_false deps/main.c
similarity index 100%
rename from test cases/common/291 source set if_false deps/main.c
rename to test cases/common/294 source set if_false deps/main.c
diff --git a/test cases/common/291 source set if_false deps/meson.build b/test cases/common/294 source set if_false deps/meson.build
similarity index 100%
rename from test cases/common/291 source set if_false deps/meson.build
rename to test cases/common/294 source set if_false deps/meson.build
diff --git a/test cases/failing/125 generator host binary/exe.c b/test cases/failing/124 generator host binary/exe.c
similarity index 100%
rename from test cases/failing/125 generator host binary/exe.c
rename to test cases/failing/124 generator host binary/exe.c
diff --git a/test cases/failing/125 generator host binary/lib.in b/test cases/failing/124 generator host binary/lib.in
similarity index 100%
rename from test cases/failing/125 generator host binary/lib.in
rename to test cases/failing/124 generator host binary/lib.in
diff --git a/test cases/failing/125 generator host binary/meson.build b/test cases/failing/124 generator host binary/meson.build
similarity index 100%
rename from test cases/failing/125 generator host binary/meson.build
rename to test cases/failing/124 generator host binary/meson.build
diff --git a/test cases/failing/125 generator host binary/test.json b/test cases/failing/124 generator host binary/test.json
similarity index 100%
rename from test cases/failing/125 generator host binary/test.json
rename to test cases/failing/124 generator host binary/test.json
diff --git a/test cases/failing/126 invalid ast/meson.build b/test cases/failing/125 invalid ast/meson.build
similarity index 100%
rename from test cases/failing/126 invalid ast/meson.build
rename to test cases/failing/125 invalid ast/meson.build
diff --git a/test cases/failing/126 invalid ast/test.json b/test cases/failing/125 invalid ast/test.json
similarity index 67%
rename from test cases/failing/126 invalid ast/test.json
rename to test cases/failing/125 invalid ast/test.json
index 7dc0684..7b659c1 100644
--- a/test cases/failing/126 invalid ast/test.json
+++ b/test cases/failing/125 invalid ast/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/126 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/125 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/127 invalid project function/meson.build b/test cases/failing/126 invalid project function/meson.build
similarity index 100%
rename from test cases/failing/127 invalid project function/meson.build
rename to test cases/failing/126 invalid project function/meson.build
diff --git a/test cases/failing/127 invalid project function/test.json b/test cases/failing/126 invalid project function/test.json
similarity index 69%
rename from test cases/failing/127 invalid project function/test.json
rename to test cases/failing/126 invalid project function/test.json
index bf9cc16..e826185 100644
--- a/test cases/failing/127 invalid project function/test.json
+++ b/test cases/failing/126 invalid project function/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/127 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/126 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/128 utf8 with bom/meson.build b/test cases/failing/127 utf8 with bom/meson.build
similarity index 100%
rename from test cases/failing/128 utf8 with bom/meson.build
rename to test cases/failing/127 utf8 with bom/meson.build
diff --git a/test cases/failing/128 utf8 with bom/test.json b/test cases/failing/127 utf8 with bom/test.json
similarity index 63%
rename from test cases/failing/128 utf8 with bom/test.json
rename to test cases/failing/127 utf8 with bom/test.json
index 8b12ba2..686077d 100644
--- a/test cases/failing/128 utf8 with bom/test.json
+++ b/test cases/failing/127 utf8 with bom/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/128 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/127 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/129 utf8 with bom subdir/meson.build b/test cases/failing/128 utf8 with bom subdir/meson.build
similarity index 100%
rename from test cases/failing/129 utf8 with bom subdir/meson.build
rename to test cases/failing/128 utf8 with bom subdir/meson.build
diff --git a/test cases/failing/129 utf8 with bom subdir/subdir/meson.build b/test cases/failing/128 utf8 with bom subdir/subdir/meson.build
similarity index 100%
rename from test cases/failing/129 utf8 with bom subdir/subdir/meson.build
rename to test cases/failing/128 utf8 with bom subdir/subdir/meson.build
diff --git a/test cases/failing/129 utf8 with bom subdir/test.json b/test cases/failing/128 utf8 with bom subdir/test.json
similarity index 66%
rename from test cases/failing/129 utf8 with bom subdir/test.json
rename to test cases/failing/128 utf8 with bom subdir/test.json
index 66a97d7..f73143c 100644
--- a/test cases/failing/129 utf8 with bom subdir/test.json
+++ b/test cases/failing/128 utf8 with bom subdir/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/129 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/128 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/130 utf8 with bom options/meson.build b/test cases/failing/129 utf8 with bom options/meson.build
similarity index 100%
rename from test cases/failing/130 utf8 with bom options/meson.build
rename to test cases/failing/129 utf8 with bom options/meson.build
diff --git a/test cases/failing/130 utf8 with bom options/meson.options b/test cases/failing/129 utf8 with bom options/meson.options
similarity index 100%
rename from test cases/failing/130 utf8 with bom options/meson.options
rename to test cases/failing/129 utf8 with bom options/meson.options
diff --git a/test cases/failing/130 utf8 with bom options/test.json b/test cases/failing/129 utf8 with bom options/test.json
similarity index 65%
rename from test cases/failing/130 utf8 with bom options/test.json
rename to test cases/failing/129 utf8 with bom options/test.json
index f11a78f..9662b93 100644
--- a/test cases/failing/130 utf8 with bom options/test.json
+++ b/test cases/failing/129 utf8 with bom options/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/130 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/129 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/131 module use inside project decl/meson.build b/test cases/failing/130 module use inside project decl/meson.build
similarity index 100%
rename from test cases/failing/131 module use inside project decl/meson.build
rename to test cases/failing/130 module use inside project decl/meson.build
diff --git a/test cases/failing/131 module use inside project decl/test.json b/test cases/failing/130 module use inside project decl/test.json
similarity index 72%
rename from test cases/failing/131 module use inside project decl/test.json
rename to test cases/failing/130 module use inside project decl/test.json
index 4fef501..b886c2d 100644
--- a/test cases/failing/131 module use inside project decl/test.json
+++ b/test cases/failing/130 module use inside project decl/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/131 module use inside project decl/meson.build:4:21: ERROR: Module methods (python.find_installation) cannot be invoked during project declaration."
+        "line": "test cases/failing/130 module use inside project decl/meson.build:4:21: ERROR: Module methods (python.find_installation) cannot be invoked during project declaration."
       }
     ]
   }
diff --git a/test cases/failing/132 dub missing dependency/dub.json b/test cases/failing/131 dub missing dependency/dub.json
similarity index 100%
rename from test cases/failing/132 dub missing dependency/dub.json
rename to test cases/failing/131 dub missing dependency/dub.json
diff --git a/test cases/failing/132 dub missing dependency/dub.selections.json b/test cases/failing/131 dub missing dependency/dub.selections.json
similarity index 100%
rename from test cases/failing/132 dub missing dependency/dub.selections.json
rename to test cases/failing/131 dub missing dependency/dub.selections.json
diff --git a/test cases/failing/132 dub missing dependency/meson.build b/test cases/failing/131 dub missing dependency/meson.build
similarity index 100%
rename from test cases/failing/132 dub missing dependency/meson.build
rename to test cases/failing/131 dub missing dependency/meson.build
diff --git a/test cases/failing/132 dub missing dependency/source/app.d b/test cases/failing/131 dub missing dependency/source/app.d
similarity index 100%
rename from test cases/failing/132 dub missing dependency/source/app.d
rename to test cases/failing/131 dub missing dependency/source/app.d
diff --git a/test cases/failing/132 dub missing dependency/test.json b/test cases/failing/131 dub missing dependency/test.json
similarity index 64%
rename from test cases/failing/132 dub missing dependency/test.json
rename to test cases/failing/131 dub missing dependency/test.json
index e58dbc7..d0cf2aa 100644
--- a/test cases/failing/132 dub missing dependency/test.json
+++ b/test cases/failing/131 dub missing dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/132 dub missing dependency/meson.build:17:6: ERROR: Dependency \"urld\" not found",
+      "line": "test cases/failing/131 dub missing dependency/meson.build:17:6: ERROR: Dependency \"urld\" not found",
       "line": "dub add urld"
     }
   ]
diff --git a/test cases/failing/133 java sources in non jar target/Test.java b/test cases/failing/132 java sources in non jar target/Test.java
similarity index 100%
rename from test cases/failing/133 java sources in non jar target/Test.java
rename to test cases/failing/132 java sources in non jar target/Test.java
diff --git a/test cases/failing/133 java sources in non jar target/meson.build b/test cases/failing/132 java sources in non jar target/meson.build
similarity index 100%
rename from test cases/failing/133 java sources in non jar target/meson.build
rename to test cases/failing/132 java sources in non jar target/meson.build
diff --git a/test cases/failing/133 java sources in non jar target/test.json b/test cases/failing/132 java sources in non jar target/test.json
similarity index 71%
rename from test cases/failing/133 java sources in non jar target/test.json
rename to test cases/failing/132 java sources in non jar target/test.json
index 877ea16..17f6345 100644
--- a/test cases/failing/133 java sources in non jar target/test.json
+++ b/test cases/failing/132 java sources in non jar target/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/133 java sources in non jar target/meson.build:3:0: ERROR: Build target of type \"executable\" cannot build java source: \"Test.java\". Use \"jar\" instead."
+      "line": "test cases/failing/132 java sources in non jar target/meson.build:3:0: ERROR: Build target of type \"executable\" cannot build java source: \"Test.java\". Use \"jar\" instead."
     }
   ]
 }
diff --git a/test cases/failing/134 rust link_language/f.rs b/test cases/failing/133 rust link_language/f.rs
similarity index 100%
rename from test cases/failing/134 rust link_language/f.rs
rename to test cases/failing/133 rust link_language/f.rs
diff --git a/test cases/failing/134 rust link_language/meson.build b/test cases/failing/133 rust link_language/meson.build
similarity index 100%
rename from test cases/failing/134 rust link_language/meson.build
rename to test cases/failing/133 rust link_language/meson.build
diff --git a/test cases/failing/134 rust link_language/test.json b/test cases/failing/133 rust link_language/test.json
similarity index 66%
rename from test cases/failing/134 rust link_language/test.json
rename to test cases/failing/133 rust link_language/test.json
index e144149..a67c18f 100644
--- a/test cases/failing/134 rust link_language/test.json
+++ b/test cases/failing/133 rust link_language/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/134 rust link_language/meson.build:10:0: ERROR: cannot build Rust sources with a different link_language"
+            "line": "test cases/failing/133 rust link_language/meson.build:10:0: ERROR: cannot build Rust sources with a different link_language"
         }
     ]
 }
diff --git a/test cases/failing/135 invalid build_subdir/existing-dir/config.h.in b/test cases/failing/134 invalid build_subdir/existing-dir/config.h.in
similarity index 100%
rename from test cases/failing/135 invalid build_subdir/existing-dir/config.h.in
rename to test cases/failing/134 invalid build_subdir/existing-dir/config.h.in
diff --git a/test cases/failing/135 invalid build_subdir/meson.build b/test cases/failing/134 invalid build_subdir/meson.build
similarity index 100%
rename from test cases/failing/135 invalid build_subdir/meson.build
rename to test cases/failing/134 invalid build_subdir/meson.build
diff --git a/test cases/failing/135 invalid build_subdir/test.json b/test cases/failing/134 invalid build_subdir/test.json
similarity index 66%
rename from test cases/failing/135 invalid build_subdir/test.json
rename to test cases/failing/134 invalid build_subdir/test.json
index aecc4e9..9196872 100644
--- a/test cases/failing/135 invalid build_subdir/test.json
+++ b/test cases/failing/134 invalid build_subdir/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/135 invalid build_subdir/meson.build:18:0: ERROR: Build subdir \"existing-dir\" in \"config.h\" exists in source tree."
+      "line": "test cases/failing/134 invalid build_subdir/meson.build:18:0: ERROR: Build subdir \"existing-dir\" in \"config.h\" exists in source tree."
     }
   ]
 }
diff --git a/test cases/failing/136 cargo toml error/meson.build b/test cases/failing/135 cargo toml error/meson.build
similarity index 100%
rename from test cases/failing/136 cargo toml error/meson.build
rename to test cases/failing/135 cargo toml error/meson.build
diff --git a/test cases/failing/136 cargo toml error/subprojects/foo-0-rs.wrap b/test cases/failing/135 cargo toml error/subprojects/foo-0-rs.wrap
similarity index 100%
rename from test cases/failing/136 cargo toml error/subprojects/foo-0-rs.wrap
rename to test cases/failing/135 cargo toml error/subprojects/foo-0-rs.wrap
diff --git a/test cases/failing/136 cargo toml error/subprojects/foo-0-rs/Cargo.toml b/test cases/failing/135 cargo toml error/subprojects/foo-0-rs/Cargo.toml
similarity index 100%
rename from test cases/failing/136 cargo toml error/subprojects/foo-0-rs/Cargo.toml
rename to test cases/failing/135 cargo toml error/subprojects/foo-0-rs/Cargo.toml
diff --git a/test cases/failing/136 cargo toml error/test.json b/test cases/failing/135 cargo toml error/test.json
similarity index 70%
rename from test cases/failing/136 cargo toml error/test.json
rename to test cases/failing/135 cargo toml error/test.json
index 480cf64..f187fab 100644
--- a/test cases/failing/136 cargo toml error/test.json
+++ b/test cases/failing/135 cargo toml error/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/136 cargo toml error/(subprojects/foo-0-rs/Cargo\\.toml:6:13|meson\\.build:19:10): ERROR: Cannot overwrite a value( \\(at.*)?"
+      "line": "test cases/failing/135 cargo toml error/(subprojects/foo-0-rs/Cargo\\.toml:6:13|meson\\.build:19:10): ERROR: Cannot overwrite a value( \\(at.*)?"
     }
   ]
 }
diff --git a/test cases/failing/137 cython using implicit c explicitly/foo.c b/test cases/failing/136 cython using implicit c explicitly/foo.c
similarity index 100%
rename from test cases/failing/137 cython using implicit c explicitly/foo.c
rename to test cases/failing/136 cython using implicit c explicitly/foo.c
diff --git a/test cases/failing/137 cython using implicit c explicitly/meson.build b/test cases/failing/136 cython using implicit c explicitly/meson.build
similarity index 100%
rename from test cases/failing/137 cython using implicit c explicitly/meson.build
rename to test cases/failing/136 cython using implicit c explicitly/meson.build
diff --git a/test cases/failing/137 cython using implicit c explicitly/test.json b/test cases/failing/136 cython using implicit c explicitly/test.json
similarity index 62%
rename from test cases/failing/137 cython using implicit c explicitly/test.json
rename to test cases/failing/136 cython using implicit c explicitly/test.json
index fe13533..31b5b30 100644
--- a/test cases/failing/137 cython using implicit c explicitly/test.json
+++ b/test cases/failing/136 cython using implicit c explicitly/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/137 cython using implicit c explicitly/meson.build:14:0: ERROR: No host machine compiler for 'foo.c'"
+      "line": "test cases/failing/136 cython using implicit c explicitly/meson.build:14:0: ERROR: No host machine compiler for 'foo.c'"
     }
   ]
 }
diff --git a/test cases/rust/31 rust.workspace package/Cargo.lock b/test cases/rust/32 rust.workspace package/Cargo.lock
similarity index 100%
rename from test cases/rust/31 rust.workspace package/Cargo.lock
rename to test cases/rust/32 rust.workspace package/Cargo.lock
diff --git a/test cases/rust/31 rust.workspace package/Cargo.toml b/test cases/rust/32 rust.workspace package/Cargo.toml
similarity index 100%
rename from test cases/rust/31 rust.workspace package/Cargo.toml
rename to test cases/rust/32 rust.workspace package/Cargo.toml
diff --git a/test cases/rust/31 rust.workspace package/meson.build b/test cases/rust/32 rust.workspace package/meson.build
similarity index 100%
rename from test cases/rust/31 rust.workspace package/meson.build
rename to test cases/rust/32 rust.workspace package/meson.build
diff --git a/test cases/rust/31 rust.workspace package/src/main.rs b/test cases/rust/32 rust.workspace package/src/main.rs
similarity index 100%
rename from test cases/rust/31 rust.workspace package/src/main.rs
rename to test cases/rust/32 rust.workspace package/src/main.rs
diff --git a/test cases/rust/31 rust.workspace package/subprojects/answer-2-rs.wrap b/test cases/rust/32 rust.workspace package/subprojects/answer-2-rs.wrap
similarity index 100%
rename from test cases/rust/31 rust.workspace package/subprojects/answer-2-rs.wrap
rename to test cases/rust/32 rust.workspace package/subprojects/answer-2-rs.wrap
diff --git a/test cases/rust/31 rust.workspace package/subprojects/answer-2.1/Cargo.toml b/test cases/rust/32 rust.workspace package/subprojects/answer-2.1/Cargo.toml
similarity index 100%
rename from test cases/rust/31 rust.workspace package/subprojects/answer-2.1/Cargo.toml
rename to test cases/rust/32 rust.workspace package/subprojects/answer-2.1/Cargo.toml
diff --git a/test cases/rust/31 rust.workspace package/subprojects/answer-2.1/meson.build b/test cases/rust/32 rust.workspace package/subprojects/answer-2.1/meson.build
similarity index 100%
rename from test cases/rust/31 rust.workspace package/subprojects/answer-2.1/meson.build
rename to test cases/rust/32 rust.workspace package/subprojects/answer-2.1/meson.build
diff --git a/test cases/rust/31 rust.workspace package/subprojects/answer-2.1/src/lib.rs b/test cases/rust/32 rust.workspace package/subprojects/answer-2.1/src/lib.rs
similarity index 100%
rename from test cases/rust/31 rust.workspace package/subprojects/answer-2.1/src/lib.rs
rename to test cases/rust/32 rust.workspace package/subprojects/answer-2.1/src/lib.rs
diff --git a/test cases/rust/31 rust.workspace package/subprojects/hello-1-rs.wrap b/test cases/rust/32 rust.workspace package/subprojects/hello-1-rs.wrap
similarity index 100%
rename from test cases/rust/31 rust.workspace package/subprojects/hello-1-rs.wrap
rename to test cases/rust/32 rust.workspace package/subprojects/hello-1-rs.wrap
diff --git a/test cases/rust/31 rust.workspace package/subprojects/hello-1.0/Cargo.toml b/test cases/rust/32 rust.workspace package/subprojects/hello-1.0/Cargo.toml
similarity index 100%
rename from test cases/rust/31 rust.workspace package/subprojects/hello-1.0/Cargo.toml
rename to test cases/rust/32 rust.workspace package/subprojects/hello-1.0/Cargo.toml
diff --git a/test cases/rust/31 rust.workspace package/subprojects/hello-1.0/src/lib.rs b/test cases/rust/32 rust.workspace package/subprojects/hello-1.0/src/lib.rs
similarity index 100%
rename from test cases/rust/31 rust.workspace package/subprojects/hello-1.0/src/lib.rs
rename to test cases/rust/32 rust.workspace package/subprojects/hello-1.0/src/lib.rs
diff --git a/test cases/rust/32 cargo workspace/meson.build b/test cases/rust/33 cargo workspace/meson.build
similarity index 100%
rename from test cases/rust/32 cargo workspace/meson.build
rename to test cases/rust/33 cargo workspace/meson.build
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo.wrap b/test cases/rust/33 cargo workspace/subprojects/foo.wrap
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo.wrap
rename to test cases/rust/33 cargo workspace/subprojects/foo.wrap
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/Cargo.toml b/test cases/rust/33 cargo workspace/subprojects/foo/Cargo.toml
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/Cargo.toml
rename to test cases/rust/33 cargo workspace/subprojects/foo/Cargo.toml
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/src/foo/Cargo.toml b/test cases/rust/33 cargo workspace/subprojects/foo/src/foo/Cargo.toml
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/src/foo/Cargo.toml
rename to test cases/rust/33 cargo workspace/subprojects/foo/src/foo/Cargo.toml
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/src/foo/src/lib.rs b/test cases/rust/33 cargo workspace/subprojects/foo/src/foo/src/lib.rs
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/src/foo/src/lib.rs
rename to test cases/rust/33 cargo workspace/subprojects/foo/src/foo/src/lib.rs
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/src/lib.rs b/test cases/rust/33 cargo workspace/subprojects/foo/src/lib.rs
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/src/lib.rs
rename to test cases/rust/33 cargo workspace/subprojects/foo/src/lib.rs
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/src/member1/Cargo.toml b/test cases/rust/33 cargo workspace/subprojects/foo/src/member1/Cargo.toml
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/src/member1/Cargo.toml
rename to test cases/rust/33 cargo workspace/subprojects/foo/src/member1/Cargo.toml
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/src/member1/src/lib.rs b/test cases/rust/33 cargo workspace/subprojects/foo/src/member1/src/lib.rs
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/src/member1/src/lib.rs
rename to test cases/rust/33 cargo workspace/subprojects/foo/src/member1/src/lib.rs
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap b/test cases/rust/33 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap
rename to test cases/rust/33 cargo workspace/subprojects/foo/subprojects/member2-1-rs.wrap
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml b/test cases/rust/33 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml
rename to test cases/rust/33 cargo workspace/subprojects/foo/subprojects/member2-1.0/Cargo.toml
diff --git a/test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs b/test cases/rust/33 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs
rename to test cases/rust/33 cargo workspace/subprojects/foo/subprojects/member2-1.0/src/lib.rs
diff --git a/test cases/rust/32 cargo workspace/subprojects/member2.wrap b/test cases/rust/33 cargo workspace/subprojects/member2.wrap
similarity index 100%
rename from test cases/rust/32 cargo workspace/subprojects/member2.wrap
rename to test cases/rust/33 cargo workspace/subprojects/member2.wrap
diff --git a/test cases/rust/32 cargo workspace/test_foo_1.c b/test cases/rust/33 cargo workspace/test_foo_1.c
similarity index 100%
rename from test cases/rust/32 cargo workspace/test_foo_1.c
rename to test cases/rust/33 cargo workspace/test_foo_1.c
diff --git a/test cases/rust/32 cargo workspace/test_foo_1.rs b/test cases/rust/33 cargo workspace/test_foo_1.rs
similarity index 100%
rename from test cases/rust/32 cargo workspace/test_foo_1.rs
rename to test cases/rust/33 cargo workspace/test_foo_1.rs
diff --git a/test cases/rust/32 rust.workspace workspace/Cargo.lock b/test cases/rust/34 rust.workspace workspace/Cargo.lock
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/Cargo.lock
rename to test cases/rust/34 rust.workspace workspace/Cargo.lock
diff --git a/test cases/rust/32 rust.workspace workspace/Cargo.toml b/test cases/rust/34 rust.workspace workspace/Cargo.toml
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/Cargo.toml
rename to test cases/rust/34 rust.workspace workspace/Cargo.toml
diff --git a/test cases/rust/32 rust.workspace workspace/meson.build b/test cases/rust/34 rust.workspace workspace/meson.build
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/meson.build
rename to test cases/rust/34 rust.workspace workspace/meson.build
diff --git a/test cases/rust/32 rust.workspace workspace/more/Cargo.toml b/test cases/rust/34 rust.workspace workspace/more/Cargo.toml
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/more/Cargo.toml
rename to test cases/rust/34 rust.workspace workspace/more/Cargo.toml
diff --git a/test cases/rust/32 rust.workspace workspace/more/meson.build b/test cases/rust/34 rust.workspace workspace/more/meson.build
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/more/meson.build
rename to test cases/rust/34 rust.workspace workspace/more/meson.build
diff --git a/test cases/rust/32 rust.workspace workspace/more/src/lib.rs b/test cases/rust/34 rust.workspace workspace/more/src/lib.rs
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/more/src/lib.rs
rename to test cases/rust/34 rust.workspace workspace/more/src/lib.rs
diff --git a/test cases/rust/32 rust.workspace workspace/src/main.rs b/test cases/rust/34 rust.workspace workspace/src/main.rs
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/src/main.rs
rename to test cases/rust/34 rust.workspace workspace/src/main.rs
diff --git a/test cases/rust/32 rust.workspace workspace/src/meson.build b/test cases/rust/34 rust.workspace workspace/src/meson.build
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/src/meson.build
rename to test cases/rust/34 rust.workspace workspace/src/meson.build
diff --git a/test cases/rust/32 rust.workspace workspace/subprojects/answer-2-rs.wrap b/test cases/rust/34 rust.workspace workspace/subprojects/answer-2-rs.wrap
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/subprojects/answer-2-rs.wrap
rename to test cases/rust/34 rust.workspace workspace/subprojects/answer-2-rs.wrap
diff --git a/test cases/rust/32 rust.workspace workspace/subprojects/answer-2.1/Cargo.toml b/test cases/rust/34 rust.workspace workspace/subprojects/answer-2.1/Cargo.toml
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/subprojects/answer-2.1/Cargo.toml
rename to test cases/rust/34 rust.workspace workspace/subprojects/answer-2.1/Cargo.toml
diff --git a/test cases/rust/32 rust.workspace workspace/subprojects/answer-2.1/meson.build b/test cases/rust/34 rust.workspace workspace/subprojects/answer-2.1/meson.build
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/subprojects/answer-2.1/meson.build
rename to test cases/rust/34 rust.workspace workspace/subprojects/answer-2.1/meson.build
diff --git a/test cases/rust/32 rust.workspace workspace/subprojects/answer-2.1/src/lib.rs b/test cases/rust/34 rust.workspace workspace/subprojects/answer-2.1/src/lib.rs
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/subprojects/answer-2.1/src/lib.rs
rename to test cases/rust/34 rust.workspace workspace/subprojects/answer-2.1/src/lib.rs
diff --git a/test cases/rust/32 rust.workspace workspace/subprojects/hello-1-rs.wrap b/test cases/rust/34 rust.workspace workspace/subprojects/hello-1-rs.wrap
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/subprojects/hello-1-rs.wrap
rename to test cases/rust/34 rust.workspace workspace/subprojects/hello-1-rs.wrap
diff --git a/test cases/rust/32 rust.workspace workspace/subprojects/hello-1.0/Cargo.toml b/test cases/rust/34 rust.workspace workspace/subprojects/hello-1.0/Cargo.toml
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/subprojects/hello-1.0/Cargo.toml
rename to test cases/rust/34 rust.workspace workspace/subprojects/hello-1.0/Cargo.toml
diff --git a/test cases/rust/32 rust.workspace workspace/subprojects/hello-1.0/src/lib.rs b/test cases/rust/34 rust.workspace workspace/subprojects/hello-1.0/src/lib.rs
similarity index 100%
rename from test cases/rust/32 rust.workspace workspace/subprojects/hello-1.0/src/lib.rs
rename to test cases/rust/34 rust.workspace workspace/subprojects/hello-1.0/src/lib.rs
diff --git a/test cases/rust/33 cargo multiple versions/meson.build b/test cases/rust/35 cargo multiple versions/meson.build
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/meson.build
rename to test cases/rust/35 cargo multiple versions/meson.build
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs.wrap b/test cases/rust/35 cargo multiple versions/subprojects/foo-1-rs.wrap
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs.wrap
rename to test cases/rust/35 cargo multiple versions/subprojects/foo-1-rs.wrap
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs/Cargo.toml b/test cases/rust/35 cargo multiple versions/subprojects/foo-1-rs/Cargo.toml
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs/Cargo.toml
rename to test cases/rust/35 cargo multiple versions/subprojects/foo-1-rs/Cargo.toml
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs/lib.rs b/test cases/rust/35 cargo multiple versions/subprojects/foo-1-rs/lib.rs
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/foo-1-rs/lib.rs
rename to test cases/rust/35 cargo multiple versions/subprojects/foo-1-rs/lib.rs
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs.wrap b/test cases/rust/35 cargo multiple versions/subprojects/foo-2-rs.wrap
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs.wrap
rename to test cases/rust/35 cargo multiple versions/subprojects/foo-2-rs.wrap
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs/Cargo.toml b/test cases/rust/35 cargo multiple versions/subprojects/foo-2-rs/Cargo.toml
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs/Cargo.toml
rename to test cases/rust/35 cargo multiple versions/subprojects/foo-2-rs/Cargo.toml
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs/lib.rs b/test cases/rust/35 cargo multiple versions/subprojects/foo-2-rs/lib.rs
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/foo-2-rs/lib.rs
rename to test cases/rust/35 cargo multiple versions/subprojects/foo-2-rs/lib.rs
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/main.wrap b/test cases/rust/35 cargo multiple versions/subprojects/main.wrap
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/main.wrap
rename to test cases/rust/35 cargo multiple versions/subprojects/main.wrap
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/main/Cargo.toml b/test cases/rust/35 cargo multiple versions/subprojects/main/Cargo.toml
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/main/Cargo.toml
rename to test cases/rust/35 cargo multiple versions/subprojects/main/Cargo.toml
diff --git a/test cases/rust/33 cargo multiple versions/subprojects/main/lib.rs b/test cases/rust/35 cargo multiple versions/subprojects/main/lib.rs
similarity index 100%
rename from test cases/rust/33 cargo multiple versions/subprojects/main/lib.rs
rename to test cases/rust/35 cargo multiple versions/subprojects/main/lib.rs
diff --git a/test cases/rust/34 staticlib rlib deps/lib.rs b/test cases/rust/36 staticlib rlib deps/lib.rs
similarity index 100%
rename from test cases/rust/34 staticlib rlib deps/lib.rs
rename to test cases/rust/36 staticlib rlib deps/lib.rs
diff --git a/test cases/rust/34 staticlib rlib deps/main.c b/test cases/rust/36 staticlib rlib deps/main.c
similarity index 100%
rename from test cases/rust/34 staticlib rlib deps/main.c
rename to test cases/rust/36 staticlib rlib deps/main.c
diff --git a/test cases/rust/34 staticlib rlib deps/meson.build b/test cases/rust/36 staticlib rlib deps/meson.build
similarity index 100%
rename from test cases/rust/34 staticlib rlib deps/meson.build
rename to test cases/rust/36 staticlib rlib deps/meson.build
diff --git a/test cases/rust/34 staticlib rlib deps/staticlib.rs b/test cases/rust/36 staticlib rlib deps/staticlib.rs
similarity index 100%
rename from test cases/rust/34 staticlib rlib deps/staticlib.rs
rename to test cases/rust/36 staticlib rlib deps/staticlib.rs
diff --git a/test cases/rust/35 apple framework/lib.rs b/test cases/rust/37 apple framework/lib.rs
similarity index 100%
rename from test cases/rust/35 apple framework/lib.rs
rename to test cases/rust/37 apple framework/lib.rs
diff --git a/test cases/rust/35 apple framework/main.rs b/test cases/rust/37 apple framework/main.rs
similarity index 100%
rename from test cases/rust/35 apple framework/main.rs
rename to test cases/rust/37 apple framework/main.rs
diff --git a/test cases/rust/35 apple framework/meson.build b/test cases/rust/37 apple framework/meson.build
similarity index 100%
rename from test cases/rust/35 apple framework/meson.build
rename to test cases/rust/37 apple framework/meson.build
diff --git a/test cases/rust/36 probes/meson.build b/test cases/rust/38 probes/meson.build
similarity index 100%
rename from test cases/rust/36 probes/meson.build
rename to test cases/rust/38 probes/meson.build
diff --git a/test cases/rust/37 rustflags env/meson.build b/test cases/rust/39 rustflags env/meson.build
similarity index 100%
rename from test cases/rust/37 rustflags env/meson.build
rename to test cases/rust/39 rustflags env/meson.build
diff --git a/test cases/rust/37 rustflags env/prog.rs b/test cases/rust/39 rustflags env/prog.rs
similarity index 100%
rename from test cases/rust/37 rustflags env/prog.rs
rename to test cases/rust/39 rustflags env/prog.rs
diff --git a/test cases/rust/37 rustflags env/test.json b/test cases/rust/39 rustflags env/test.json
similarity index 100%
rename from test cases/rust/37 rustflags env/test.json
rename to test cases/rust/39 rustflags env/test.json
diff --git a/test cases/rust/38 cargo dep multiple version/Cargo.lock b/test cases/rust/40 cargo dep multiple version/Cargo.lock
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/Cargo.lock
rename to test cases/rust/40 cargo dep multiple version/Cargo.lock
diff --git a/test cases/rust/38 cargo dep multiple version/Cargo.toml b/test cases/rust/40 cargo dep multiple version/Cargo.toml
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/Cargo.toml
rename to test cases/rust/40 cargo dep multiple version/Cargo.toml
diff --git a/test cases/rust/38 cargo dep multiple version/meson.build b/test cases/rust/40 cargo dep multiple version/meson.build
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/meson.build
rename to test cases/rust/40 cargo dep multiple version/meson.build
diff --git a/test cases/rust/38 cargo dep multiple version/src/main.rs b/test cases/rust/40 cargo dep multiple version/src/main.rs
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/src/main.rs
rename to test cases/rust/40 cargo dep multiple version/src/main.rs
diff --git a/test cases/rust/38 cargo dep multiple version/subprojects/answer-2-rs.wrap b/test cases/rust/40 cargo dep multiple version/subprojects/answer-2-rs.wrap
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/subprojects/answer-2-rs.wrap
rename to test cases/rust/40 cargo dep multiple version/subprojects/answer-2-rs.wrap
diff --git a/test cases/rust/38 cargo dep multiple version/subprojects/answer-2.1/Cargo.toml b/test cases/rust/40 cargo dep multiple version/subprojects/answer-2.1/Cargo.toml
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/subprojects/answer-2.1/Cargo.toml
rename to test cases/rust/40 cargo dep multiple version/subprojects/answer-2.1/Cargo.toml
diff --git a/test cases/rust/38 cargo dep multiple version/subprojects/answer-2.1/src/lib.rs b/test cases/rust/40 cargo dep multiple version/subprojects/answer-2.1/src/lib.rs
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/subprojects/answer-2.1/src/lib.rs
rename to test cases/rust/40 cargo dep multiple version/subprojects/answer-2.1/src/lib.rs
diff --git a/test cases/rust/38 cargo dep multiple version/subprojects/hello-3-rs.wrap b/test cases/rust/40 cargo dep multiple version/subprojects/hello-3-rs.wrap
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/subprojects/hello-3-rs.wrap
rename to test cases/rust/40 cargo dep multiple version/subprojects/hello-3-rs.wrap
diff --git a/test cases/rust/38 cargo dep multiple version/subprojects/hello-3.0/Cargo.toml b/test cases/rust/40 cargo dep multiple version/subprojects/hello-3.0/Cargo.toml
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/subprojects/hello-3.0/Cargo.toml
rename to test cases/rust/40 cargo dep multiple version/subprojects/hello-3.0/Cargo.toml
diff --git a/test cases/rust/38 cargo dep multiple version/subprojects/hello-3.0/src/lib.rs b/test cases/rust/40 cargo dep multiple version/subprojects/hello-3.0/src/lib.rs
similarity index 100%
rename from test cases/rust/38 cargo dep multiple version/subprojects/hello-3.0/src/lib.rs
rename to test cases/rust/40 cargo dep multiple version/subprojects/hello-3.0/src/lib.rs
diff --git a/test cases/rust/39 shared-lib-no-static-libc/lib.rs b/test cases/rust/41 shared-lib-no-static-libc/lib.rs
similarity index 100%
rename from test cases/rust/39 shared-lib-no-static-libc/lib.rs
rename to test cases/rust/41 shared-lib-no-static-libc/lib.rs
diff --git a/test cases/rust/39 shared-lib-no-static-libc/main.c b/test cases/rust/41 shared-lib-no-static-libc/main.c
similarity index 100%
rename from test cases/rust/39 shared-lib-no-static-libc/main.c
rename to test cases/rust/41 shared-lib-no-static-libc/main.c
diff --git a/test cases/rust/39 shared-lib-no-static-libc/meson.build b/test cases/rust/41 shared-lib-no-static-libc/meson.build
similarity index 100%
rename from test cases/rust/39 shared-lib-no-static-libc/meson.build
rename to test cases/rust/41 shared-lib-no-static-libc/meson.build
diff --git a/test cases/rust/39 shared-lib-no-static-libc/shim.c b/test cases/rust/41 shared-lib-no-static-libc/shim.c
similarity index 100%
rename from test cases/rust/39 shared-lib-no-static-libc/shim.c
rename to test cases/rust/41 shared-lib-no-static-libc/shim.c
diff --git a/test cases/rust/39 shared-lib-no-static-libc/test.json b/test cases/rust/41 shared-lib-no-static-libc/test.json
similarity index 100%
rename from test cases/rust/39 shared-lib-no-static-libc/test.json
rename to test cases/rust/41 shared-lib-no-static-libc/test.json
diff --git a/test cases/rust/40 build_subdir/main.rs b/test cases/rust/42 build_subdir/main.rs
similarity index 100%
rename from test cases/rust/40 build_subdir/main.rs
rename to test cases/rust/42 build_subdir/main.rs
diff --git a/test cases/rust/40 build_subdir/meson.build b/test cases/rust/42 build_subdir/meson.build
similarity index 100%
rename from test cases/rust/40 build_subdir/meson.build
rename to test cases/rust/42 build_subdir/meson.build
diff --git a/test cases/rust/40 build_subdir/mylib.c b/test cases/rust/42 build_subdir/mylib.c
similarity index 100%
rename from test cases/rust/40 build_subdir/mylib.c
rename to test cases/rust/42 build_subdir/mylib.c
diff --git a/test cases/rust/40 build_subdir/mylib.rs b/test cases/rust/42 build_subdir/mylib.rs
similarity index 100%
rename from test cases/rust/40 build_subdir/mylib.rs
rename to test cases/rust/42 build_subdir/mylib.rs
diff --git a/test cases/unit/133 promote link_language/consumer.c b/test cases/unit/134 promote link_language/consumer.c
similarity index 100%
rename from test cases/unit/133 promote link_language/consumer.c
rename to test cases/unit/134 promote link_language/consumer.c
diff --git a/test cases/unit/133 promote link_language/header.h b/test cases/unit/134 promote link_language/header.h
similarity index 100%
rename from test cases/unit/133 promote link_language/header.h
rename to test cases/unit/134 promote link_language/header.h
diff --git a/test cases/unit/133 promote link_language/lib.cpp b/test cases/unit/134 promote link_language/lib.cpp
similarity index 100%
rename from test cases/unit/133 promote link_language/lib.cpp
rename to test cases/unit/134 promote link_language/lib.cpp
diff --git a/test cases/unit/133 promote link_language/meson.build b/test cases/unit/134 promote link_language/meson.build
similarity index 100%
rename from test cases/unit/133 promote link_language/meson.build
rename to test cases/unit/134 promote link_language/meson.build
diff --git a/test cases/unit/134 minimal bindgen/header.h b/test cases/unit/135 minimal bindgen/header.h
similarity index 100%
rename from test cases/unit/134 minimal bindgen/header.h
rename to test cases/unit/135 minimal bindgen/header.h
diff --git a/test cases/unit/134 minimal bindgen/meson.build b/test cases/unit/135 minimal bindgen/meson.build
similarity index 100%
rename from test cases/unit/134 minimal bindgen/meson.build
rename to test cases/unit/135 minimal bindgen/meson.build
diff --git a/test cases/unit/134 minimal bindgen/meson.options b/test cases/unit/135 minimal bindgen/meson.options
similarity index 100%
rename from test cases/unit/134 minimal bindgen/meson.options
rename to test cases/unit/135 minimal bindgen/meson.options
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 477f8e1..8026d9d 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -5430,7 +5430,7 @@
     def test_link_language_promotion(self):
         if self.backend is Backend.vs:
             raise SkipTest('target introspection is lacking linker details')
-        testdir = os.path.join(self.unit_test_dir, '133 promote link_language')
+        testdir = os.path.join(self.unit_test_dir, '134 promote link_language')
         self.init(testdir)
         cintrospection = self.introspect('--compilers')
         clinker = cintrospection['host']['c']['linker_exelist']
diff --git a/unittests/darwintests.py b/unittests/darwintests.py
index 64e2887..a7345b3 100644
--- a/unittests/darwintests.py
+++ b/unittests/darwintests.py
@@ -182,7 +182,7 @@
         so that external tools (like cargo) can link against them without
         meson's help.
         '''
-        testdir = os.path.join(self.rust_test_dir, '35 apple framework')
+        testdir = os.path.join(self.rust_test_dir, '37 apple framework')
         self.init(testdir)
         # Build only the library, not the executable
         self.build(target='timelib')
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index 75329af..a79bd6d 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -2005,7 +2005,7 @@
         dependencies of the staticlib are not passed to the C linker.
         See: https://github.com/mesonbuild/meson/issues/11721
         '''
-        testdir = os.path.join(self.rust_test_dir, '34 staticlib rlib deps')
+        testdir = os.path.join(self.rust_test_dir, '36 staticlib rlib deps')
         self.init(testdir)
         targets = self.introspect('--targets')
         executable = next(t for t in targets if t['type'] == 'executable')
diff --git a/unittests/machinefiletests.py b/unittests/machinefiletests.py
index f6bcbd4..5766473 100644
--- a/unittests/machinefiletests.py
+++ b/unittests/machinefiletests.py
@@ -1029,7 +1029,7 @@
     @skip_if_not_language('rust')
     @skipIfNoExecutable('bindgen')
     def test_bindgen_finds_target_in_clang_options(self) -> None:
-        testcase = os.path.join(self.unit_test_dir, '134 minimal bindgen')
+        testcase = os.path.join(self.unit_test_dir, '135 minimal bindgen')
 
         def check_target(include: T.Optional[str], exclude: T.Optional[str] = None) -> None:
             configuration = self.introspect('--targets')