One more dircondensation for rc1.
diff --git a/test cases/common/252 subproject dependency variables/meson.build b/test cases/common/253 subproject dependency variables/meson.build
similarity index 100%
rename from test cases/common/252 subproject dependency variables/meson.build
rename to 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
similarity index 100%
rename from test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c
rename to 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
similarity index 100%
rename from test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build
rename to 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
similarity index 100%
rename from test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c
rename to 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
similarity index 100%
rename from test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c
rename to 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
similarity index 100%
rename from test cases/common/252 subproject dependency variables/test.json
rename to 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
similarity index 100%
rename from test cases/common/253 long output/dumper.c
rename to 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
similarity index 100%
rename from test cases/common/253 long output/meson.build
rename to 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
similarity index 100%
rename from test cases/common/253 module warnings/meson.build
rename to 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
similarity index 67%
rename from test cases/common/253 module warnings/test.json
rename to test cases/common/255 module warnings/test.json
index be31601..5556b90 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
similarity index 100%
rename from test cases/common/253 subproject extracted objects/foo.c
rename to 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
similarity index 100%
rename from test cases/common/253 subproject extracted objects/meson.build
rename to 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
similarity index 100%
rename from test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.cpp
rename to 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
similarity index 100%
rename from test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.h
rename to 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
similarity index 100%
rename from test cases/common/253 subproject extracted objects/subprojects/myobjects/meson.build
rename to 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
similarity index 100%
rename from test cases/common/253 subproject extracted objects/test.json
rename to 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
similarity index 100%
rename from test cases/common/254 generated header dep/foo.c
rename to 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
similarity index 100%
rename from test cases/common/254 generated header dep/meson.build
rename to 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
similarity index 100%
rename from test cases/common/254 subsubproject inplace/meson.build
rename to 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
similarity index 100%
rename from test cases/common/254 subsubproject inplace/subprojects/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build
rename to 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
similarity index 100%
rename from test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap
rename to 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
similarity index 100%
rename from test cases/common/255 preprocess/bar.c
rename to 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
similarity index 100%
rename from test cases/common/255 preprocess/foo.c
rename to 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
similarity index 100%
rename from test cases/common/255 preprocess/foo.h
rename to 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
similarity index 100%
rename from test cases/common/255 preprocess/meson.build
rename to 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
similarity index 100%
rename from test cases/common/255 preprocess/src/file.map.in
rename to 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
similarity index 100%
rename from test cases/common/255 preprocess/src/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/101 relative find program/foo.py
rename to 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
similarity index 100%
rename from test cases/unit/101 relative find program/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/101 relative find program/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/102 rlib linkage/lib2.rs
rename to 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
similarity index 100%
rename from test cases/unit/102 rlib linkage/main.rs
rename to 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
similarity index 100%
rename from test cases/unit/102 rlib linkage/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/103 python without pkgconfig/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/104 strip/lib.c
rename to 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
similarity index 100%
rename from test cases/unit/104 strip/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/105 debug function/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/106 pkgconfig relocatable with absolute path/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/107 subproject symlink/cp.py
rename to 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
similarity index 100%
rename from test cases/unit/107 subproject symlink/main.c
rename to 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
similarity index 100%
rename from test cases/unit/107 subproject symlink/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile
rename to 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
similarity index 100%
rename from test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/107 subproject symlink/symlinked_subproject/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/107 subproject symlink/symlinked_subproject/src.c
rename to 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
similarity index 100%
rename from test cases/unit/108 new subproject on reconfigure/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/108 new subproject on reconfigure/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c
rename to 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
similarity index 100%
rename from test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/109 configure same noop/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/109 configure same noop/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/foo.c
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/foo.dat
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/foo.h
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/foo/foofile
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.c
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.h
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile
rename to 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
similarity index 100%
rename from test cases/unit/92 install skip subprojects/subprojects/bar/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/93 new subproject in configured project/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/93 new subproject in configured project/meson_options.txt
rename to 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
similarity index 100%
rename from test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c
rename to 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
similarity index 100%
rename from test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/94 clangformat/.clang-format
rename to 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
similarity index 100%
rename from test cases/unit/94 clangformat/.clang-format-ignore
rename to 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
similarity index 100%
rename from test cases/unit/94 clangformat/.clang-format-include
rename to 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
similarity index 100%
rename from test cases/unit/94 clangformat/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/94 clangformat/not-included/badformat.cpp
rename to 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
similarity index 100%
rename from test cases/unit/94 clangformat/src/badformat.c
rename to 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
similarity index 100%
rename from test cases/unit/94 clangformat/src/badformat.cpp
rename to 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
similarity index 100%
rename from test cases/unit/95 custominc/easytogrepfor/genh.py
rename to 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
similarity index 100%
rename from test cases/unit/95 custominc/easytogrepfor/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/95 custominc/helper.c
rename to 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
similarity index 100%
rename from test cases/unit/95 custominc/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/95 custominc/prog.c
rename to 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
similarity index 100%
rename from test cases/unit/95 custominc/prog2.c
rename to 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
similarity index 100%
rename from test cases/unit/96 implicit force fallback/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/96 implicit force fallback/subprojects/something/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/97 compiler.links file arg/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/97 compiler.links file arg/test.c
rename to 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
similarity index 100%
rename from test cases/unit/98 link full name/.gitignore
rename to 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
similarity index 100%
rename from test cases/unit/98 link full name/libtestprovider/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/98 link full name/libtestprovider/provider.c
rename to 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
similarity index 100%
rename from test cases/unit/98 link full name/proguser/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/98 link full name/proguser/receiver.c
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/bar-custom.txt
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/bar-devel.h
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/bar-notag.txt
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/custom_files/data.txt
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/foo.in
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/foo1-devel.h
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/lib.c
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/main.c
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/script.py
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/bar2-devel.h
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/foo2.in
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/foo3-devel.h
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/lib.c
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/main.c
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/99 install all targets/subdir/script.py
rename to 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
similarity index 100%
rename from test cases/unit/100 custom target name/file.txt.in
rename to 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
similarity index 100%
rename from test cases/unit/100 custom target name/meson.build
rename to 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
similarity index 100%
rename from test cases/unit/100 custom target name/subdir/meson.build
rename to test cases/unit/99 custom target name/subdir/meson.build
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 0cc1706..d90153c 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -542,7 +542,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}}
''')
- 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 @@
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 @@
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 @@
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 7de3214..357e420 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -1350,7 +1350,7 @@
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 @@
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 @@
@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 ed5d96b..fc40442 100644
--- a/unittests/platformagnostictests.py
+++ b/unittests/platformagnostictests.py
@@ -35,7 +35,7 @@
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 @@
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 @@
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()
