Fix test case numbers.
diff --git a/test cases/common/251 subproject dependency variables/meson.build b/test cases/common/252 subproject dependency variables/meson.build similarity index 100% rename from test cases/common/251 subproject dependency variables/meson.build rename to test cases/common/252 subproject dependency variables/meson.build
diff --git a/test cases/common/251 subproject dependency variables/subprojects/subfiles/foo.c b/test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c similarity index 100% rename from test cases/common/251 subproject dependency variables/subprojects/subfiles/foo.c rename to test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c
diff --git a/test cases/common/251 subproject dependency variables/subprojects/subfiles/meson.build b/test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build similarity index 100% rename from test cases/common/251 subproject dependency variables/subprojects/subfiles/meson.build rename to test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build
diff --git a/test cases/common/251 subproject dependency variables/subprojects/subfiles/subdir/foo.c b/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c similarity index 100% rename from test cases/common/251 subproject dependency variables/subprojects/subfiles/subdir/foo.c rename to test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c
diff --git a/test cases/common/251 subproject dependency variables/subprojects/subfiles/subdir2/foo.c b/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c similarity index 100% rename from test cases/common/251 subproject dependency variables/subprojects/subfiles/subdir2/foo.c rename to test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c
diff --git a/test cases/common/251 subproject dependency variables/test.json b/test cases/common/252 subproject dependency variables/test.json similarity index 100% rename from test cases/common/251 subproject dependency variables/test.json rename to test cases/common/252 subproject dependency variables/test.json
diff --git a/test cases/failing/123 subproject sandbox violation/meson.build b/test cases/failing/124 subproject sandbox violation/meson.build similarity index 100% rename from test cases/failing/123 subproject sandbox violation/meson.build rename to test cases/failing/124 subproject sandbox violation/meson.build
diff --git a/test cases/failing/123 subproject sandbox violation/meson_options.txt b/test cases/failing/124 subproject sandbox violation/meson_options.txt similarity index 100% rename from test cases/failing/123 subproject sandbox violation/meson_options.txt rename to test cases/failing/124 subproject sandbox violation/meson_options.txt
diff --git a/test cases/failing/123 subproject sandbox violation/subprojects/subproj1/file.txt b/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/file.txt similarity index 100% rename from test cases/failing/123 subproject sandbox violation/subprojects/subproj1/file.txt rename to test cases/failing/124 subproject sandbox violation/subprojects/subproj1/file.txt
diff --git a/test cases/failing/123 subproject sandbox violation/subprojects/subproj1/meson.build b/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/meson.build similarity index 100% rename from test cases/failing/123 subproject sandbox violation/subprojects/subproj1/meson.build rename to test cases/failing/124 subproject sandbox violation/subprojects/subproj1/meson.build
diff --git a/test cases/failing/123 subproject sandbox violation/subprojects/subproj1/nested/meson.build b/test cases/failing/124 subproject sandbox violation/subprojects/subproj1/nested/meson.build similarity index 100% rename from test cases/failing/123 subproject sandbox violation/subprojects/subproj1/nested/meson.build rename to test cases/failing/124 subproject sandbox violation/subprojects/subproj1/nested/meson.build
diff --git a/test cases/failing/123 subproject sandbox violation/subprojects/subproj2/file.txt b/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/file.txt similarity index 100% rename from test cases/failing/123 subproject sandbox violation/subprojects/subproj2/file.txt rename to test cases/failing/124 subproject sandbox violation/subprojects/subproj2/file.txt
diff --git a/test cases/failing/123 subproject sandbox violation/subprojects/subproj2/meson.build b/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/meson.build similarity index 100% rename from test cases/failing/123 subproject sandbox violation/subprojects/subproj2/meson.build rename to test cases/failing/124 subproject sandbox violation/subprojects/subproj2/meson.build
diff --git a/test cases/failing/123 subproject sandbox violation/subprojects/subproj2/nested/meson.build b/test cases/failing/124 subproject sandbox violation/subprojects/subproj2/nested/meson.build similarity index 100% rename from test cases/failing/123 subproject sandbox violation/subprojects/subproj2/nested/meson.build rename to test cases/failing/124 subproject sandbox violation/subprojects/subproj2/nested/meson.build
diff --git a/test cases/failing/123 subproject sandbox violation/subprojects/subproj3/file.txt b/test cases/failing/124 subproject sandbox violation/subprojects/subproj3/file.txt similarity index 100% rename from test cases/failing/123 subproject sandbox violation/subprojects/subproj3/file.txt rename to test cases/failing/124 subproject sandbox violation/subprojects/subproj3/file.txt
diff --git a/test cases/failing/123 subproject sandbox violation/subprojects/subproj3/meson.build b/test cases/failing/124 subproject sandbox violation/subprojects/subproj3/meson.build similarity index 100% rename from test cases/failing/123 subproject sandbox violation/subprojects/subproj3/meson.build rename to test cases/failing/124 subproject sandbox violation/subprojects/subproj3/meson.build
diff --git a/test cases/failing/123 subproject sandbox violation/test.json b/test cases/failing/124 subproject sandbox violation/test.json similarity index 82% rename from test cases/failing/123 subproject sandbox violation/test.json rename to test cases/failing/124 subproject sandbox violation/test.json index 88ea620..ca3d142 100644 --- a/test cases/failing/123 subproject sandbox violation/test.json +++ b/test cases/failing/124 subproject sandbox violation/test.json
@@ -10,7 +10,7 @@ }, "stdout": [ { - "line": "test cases/failing/123 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject." + "line": "test cases/failing/124 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject." } ] }
diff --git a/test cases/failing/124 override and add_project_dependency/inc/lib.h b/test cases/failing/125 override and add_project_dependency/inc/lib.h similarity index 100% rename from test cases/failing/124 override and add_project_dependency/inc/lib.h rename to test cases/failing/125 override and add_project_dependency/inc/lib.h
diff --git a/test cases/failing/124 override and add_project_dependency/lib.c b/test cases/failing/125 override and add_project_dependency/lib.c similarity index 100% rename from test cases/failing/124 override and add_project_dependency/lib.c rename to test cases/failing/125 override and add_project_dependency/lib.c
diff --git a/test cases/failing/124 override and add_project_dependency/meson.build b/test cases/failing/125 override and add_project_dependency/meson.build similarity index 100% rename from test cases/failing/124 override and add_project_dependency/meson.build rename to test cases/failing/125 override and add_project_dependency/meson.build
diff --git a/test cases/failing/124 override and add_project_dependency/subprojects/a/meson.build b/test cases/failing/125 override and add_project_dependency/subprojects/a/meson.build similarity index 100% rename from test cases/failing/124 override and add_project_dependency/subprojects/a/meson.build rename to test cases/failing/125 override and add_project_dependency/subprojects/a/meson.build
diff --git a/test cases/failing/124 override and add_project_dependency/subprojects/a/prog.c b/test cases/failing/125 override and add_project_dependency/subprojects/a/prog.c similarity index 100% rename from test cases/failing/124 override and add_project_dependency/subprojects/a/prog.c rename to test cases/failing/125 override and add_project_dependency/subprojects/a/prog.c
diff --git a/test cases/failing/124 override and add_project_dependency/test.json b/test cases/failing/125 override and add_project_dependency/test.json similarity index 66% rename from test cases/failing/124 override and add_project_dependency/test.json rename to test cases/failing/125 override and add_project_dependency/test.json index 42872ad..df749ec 100644 --- a/test cases/failing/124 override and add_project_dependency/test.json +++ b/test cases/failing/125 override and add_project_dependency/test.json
@@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/124 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies" + "line": "test cases/failing/125 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies" } ] }
diff --git a/test cases/failing/125 targets before add_project_dependency/inc/lib.h b/test cases/failing/126 targets before add_project_dependency/inc/lib.h similarity index 100% rename from test cases/failing/125 targets before add_project_dependency/inc/lib.h rename to test cases/failing/126 targets before add_project_dependency/inc/lib.h
diff --git a/test cases/failing/125 targets before add_project_dependency/lib.c b/test cases/failing/126 targets before add_project_dependency/lib.c similarity index 100% rename from test cases/failing/125 targets before add_project_dependency/lib.c rename to test cases/failing/126 targets before add_project_dependency/lib.c
diff --git a/test cases/failing/125 targets before add_project_dependency/meson.build b/test cases/failing/126 targets before add_project_dependency/meson.build similarity index 100% rename from test cases/failing/125 targets before add_project_dependency/meson.build rename to test cases/failing/126 targets before add_project_dependency/meson.build
diff --git a/test cases/failing/125 targets before add_project_dependency/test.json b/test cases/failing/126 targets before add_project_dependency/test.json similarity index 70% rename from test cases/failing/125 targets before add_project_dependency/test.json rename to test cases/failing/126 targets before add_project_dependency/test.json index dae9506..d467914 100644 --- a/test cases/failing/125 targets before add_project_dependency/test.json +++ b/test cases/failing/126 targets before add_project_dependency/test.json
@@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/125 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared." + "line": "test cases/failing/126 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared." } ] }
diff --git a/test cases/failing/126 extract from unity/meson.build b/test cases/failing/127 extract from unity/meson.build similarity index 100% rename from test cases/failing/126 extract from unity/meson.build rename to test cases/failing/127 extract from unity/meson.build
diff --git a/test cases/failing/126 extract from unity/src1.c b/test cases/failing/127 extract from unity/src1.c similarity index 100% rename from test cases/failing/126 extract from unity/src1.c rename to test cases/failing/127 extract from unity/src1.c
diff --git a/test cases/failing/126 extract from unity/src2.c b/test cases/failing/127 extract from unity/src2.c similarity index 100% rename from test cases/failing/126 extract from unity/src2.c rename to test cases/failing/127 extract from unity/src2.c
diff --git a/test cases/failing/126 extract from unity/test.json b/test cases/failing/127 extract from unity/test.json similarity index 73% rename from test cases/failing/126 extract from unity/test.json rename to test cases/failing/127 extract from unity/test.json index 9f3a8d8..e27599d 100644 --- a/test cases/failing/126 extract from unity/test.json +++ b/test cases/failing/127 extract from unity/test.json
@@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/126 extract from unity/meson.build:4:0: ERROR: Single object files can not be extracted in Unity builds. You can only extract all the object files for each compiler at once." + "line": "test cases/failing/127 extract from unity/meson.build:4:0: ERROR: Single object files can not be extracted in Unity builds. You can only extract all the object files for each compiler at once." } ] }
diff --git a/test cases/failing/127 subproject object as a dependency/main.c b/test cases/failing/128 subproject object as a dependency/main.c similarity index 100% rename from test cases/failing/127 subproject object as a dependency/main.c rename to test cases/failing/128 subproject object as a dependency/main.c
diff --git a/test cases/failing/127 subproject object as a dependency/meson.build b/test cases/failing/128 subproject object as a dependency/meson.build similarity index 100% rename from test cases/failing/127 subproject object as a dependency/meson.build rename to test cases/failing/128 subproject object as a dependency/meson.build
diff --git a/test cases/failing/127 subproject object as a dependency/subprojects/sub/meson.build b/test cases/failing/128 subproject object as a dependency/subprojects/sub/meson.build similarity index 100% rename from test cases/failing/127 subproject object as a dependency/subprojects/sub/meson.build rename to test cases/failing/128 subproject object as a dependency/subprojects/sub/meson.build
diff --git a/test cases/failing/127 subproject object as a dependency/test.json b/test cases/failing/128 subproject object as a dependency/test.json similarity index 64% rename from test cases/failing/127 subproject object as a dependency/test.json rename to test cases/failing/128 subproject object as a dependency/test.json index fdc85b3..b04bf37 100644 --- a/test cases/failing/127 subproject object as a dependency/test.json +++ b/test cases/failing/128 subproject object as a dependency/test.json
@@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/127 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency." + "line": "test cases/failing/128 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency." } ] }
diff --git a/test cases/unit/99 custom target name/file.txt.in b/test cases/unit/100 custom target name/file.txt.in similarity index 100% rename from test cases/unit/99 custom target name/file.txt.in rename to test cases/unit/100 custom target name/file.txt.in
diff --git a/test cases/unit/99 custom target name/meson.build b/test cases/unit/100 custom target name/meson.build similarity index 100% rename from test cases/unit/99 custom target name/meson.build rename to test cases/unit/100 custom target name/meson.build
diff --git a/test cases/unit/99 custom target name/subdir/meson.build b/test cases/unit/100 custom target name/subdir/meson.build similarity index 100% rename from test cases/unit/99 custom target name/subdir/meson.build rename to test cases/unit/100 custom target name/subdir/meson.build
diff --git a/test cases/unit/100 relative find program/foo.py b/test cases/unit/101 relative find program/foo.py similarity index 100% rename from test cases/unit/100 relative find program/foo.py rename to test cases/unit/101 relative find program/foo.py
diff --git a/test cases/unit/100 relative find program/meson.build b/test cases/unit/101 relative find program/meson.build similarity index 100% rename from test cases/unit/100 relative find program/meson.build rename to test cases/unit/101 relative find program/meson.build
diff --git a/test cases/unit/100 relative find program/subdir/meson.build b/test cases/unit/101 relative find program/subdir/meson.build similarity index 100% rename from test cases/unit/100 relative find program/subdir/meson.build rename to test cases/unit/101 relative find program/subdir/meson.build
diff --git a/test cases/unit/101 rlib linkage/lib2.rs b/test cases/unit/102 rlib linkage/lib2.rs similarity index 100% rename from test cases/unit/101 rlib linkage/lib2.rs rename to test cases/unit/102 rlib linkage/lib2.rs
diff --git a/test cases/unit/101 rlib linkage/main.rs b/test cases/unit/102 rlib linkage/main.rs similarity index 100% rename from test cases/unit/101 rlib linkage/main.rs rename to test cases/unit/102 rlib linkage/main.rs
diff --git a/test cases/unit/101 rlib linkage/meson.build b/test cases/unit/102 rlib linkage/meson.build similarity index 100% rename from test cases/unit/101 rlib linkage/meson.build rename to test cases/unit/102 rlib linkage/meson.build
diff --git a/test cases/unit/102 python without pkgconfig/meson.build b/test cases/unit/103 python without pkgconfig/meson.build similarity index 100% rename from test cases/unit/102 python without pkgconfig/meson.build rename to test cases/unit/103 python without pkgconfig/meson.build
diff --git a/test cases/unit/103 strip/lib.c b/test cases/unit/104 strip/lib.c similarity index 100% rename from test cases/unit/103 strip/lib.c rename to test cases/unit/104 strip/lib.c
diff --git a/test cases/unit/103 strip/meson.build b/test cases/unit/104 strip/meson.build similarity index 100% rename from test cases/unit/103 strip/meson.build rename to test cases/unit/104 strip/meson.build
diff --git a/test cases/unit/104 debug function/meson.build b/test cases/unit/105 debug function/meson.build similarity index 100% rename from test cases/unit/104 debug function/meson.build rename to test cases/unit/105 debug function/meson.build
diff --git a/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build b/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build similarity index 100% rename from test cases/unit/105 pkgconfig relocatable with absolute path/meson.build rename to test cases/unit/106 pkgconfig relocatable with absolute path/meson.build
diff --git a/test cases/unit/106 subproject symlink/cp.py b/test cases/unit/107 subproject symlink/cp.py similarity index 100% rename from test cases/unit/106 subproject symlink/cp.py rename to test cases/unit/107 subproject symlink/cp.py
diff --git a/test cases/unit/106 subproject symlink/main.c b/test cases/unit/107 subproject symlink/main.c similarity index 100% rename from test cases/unit/106 subproject symlink/main.c rename to test cases/unit/107 subproject symlink/main.c
diff --git a/test cases/unit/106 subproject symlink/meson.build b/test cases/unit/107 subproject symlink/meson.build similarity index 100% rename from test cases/unit/106 subproject symlink/meson.build rename to test cases/unit/107 subproject symlink/meson.build
diff --git a/test cases/unit/106 subproject symlink/symlinked_subproject/datadir/datafile b/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile similarity index 100% rename from test cases/unit/106 subproject symlink/symlinked_subproject/datadir/datafile rename to test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile
diff --git a/test cases/unit/106 subproject symlink/symlinked_subproject/datadir/meson.build b/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build similarity index 100% rename from test cases/unit/106 subproject symlink/symlinked_subproject/datadir/meson.build rename to test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build
diff --git a/test cases/unit/106 subproject symlink/symlinked_subproject/meson.build b/test cases/unit/107 subproject symlink/symlinked_subproject/meson.build similarity index 100% rename from test cases/unit/106 subproject symlink/symlinked_subproject/meson.build rename to test cases/unit/107 subproject symlink/symlinked_subproject/meson.build
diff --git a/test cases/unit/106 subproject symlink/symlinked_subproject/src.c b/test cases/unit/107 subproject symlink/symlinked_subproject/src.c similarity index 100% rename from test cases/unit/106 subproject symlink/symlinked_subproject/src.c rename to test cases/unit/107 subproject symlink/symlinked_subproject/src.c
diff --git a/test cases/unit/107 new subproject on reconfigure/meson.build b/test cases/unit/108 new subproject on reconfigure/meson.build similarity index 100% rename from test cases/unit/107 new subproject on reconfigure/meson.build rename to test cases/unit/108 new subproject on reconfigure/meson.build
diff --git a/test cases/unit/107 new subproject on reconfigure/meson_options.txt b/test cases/unit/108 new subproject on reconfigure/meson_options.txt similarity index 100% rename from test cases/unit/107 new subproject on reconfigure/meson_options.txt rename to test cases/unit/108 new subproject on reconfigure/meson_options.txt
diff --git a/test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c b/test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c similarity index 100% rename from test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c rename to test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c
diff --git a/test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build b/test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build similarity index 100% rename from test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build rename to test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build
diff --git a/test cases/unit/91 install skip subprojects/foo.c b/test cases/unit/92 install skip subprojects/foo.c similarity index 100% rename from test cases/unit/91 install skip subprojects/foo.c rename to test cases/unit/92 install skip subprojects/foo.c
diff --git a/test cases/unit/91 install skip subprojects/foo.dat b/test cases/unit/92 install skip subprojects/foo.dat similarity index 100% rename from test cases/unit/91 install skip subprojects/foo.dat rename to test cases/unit/92 install skip subprojects/foo.dat
diff --git a/test cases/unit/91 install skip subprojects/foo.h b/test cases/unit/92 install skip subprojects/foo.h similarity index 100% rename from test cases/unit/91 install skip subprojects/foo.h rename to test cases/unit/92 install skip subprojects/foo.h
diff --git a/test cases/unit/91 install skip subprojects/foo/foofile b/test cases/unit/92 install skip subprojects/foo/foofile similarity index 100% rename from test cases/unit/91 install skip subprojects/foo/foofile rename to test cases/unit/92 install skip subprojects/foo/foofile
diff --git a/test cases/unit/91 install skip subprojects/meson.build b/test cases/unit/92 install skip subprojects/meson.build similarity index 100% rename from test cases/unit/91 install skip subprojects/meson.build rename to test cases/unit/92 install skip subprojects/meson.build
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.c b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.c similarity index 100% rename from test cases/unit/91 install skip subprojects/subprojects/bar/bar.c rename to test cases/unit/92 install skip subprojects/subprojects/bar/bar.c
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat similarity index 100% rename from test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat rename to test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.h b/test cases/unit/92 install skip subprojects/subprojects/bar/bar.h similarity index 100% rename from test cases/unit/91 install skip subprojects/subprojects/bar/bar.h rename to test cases/unit/92 install skip subprojects/subprojects/bar/bar.h
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile b/test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile similarity index 100% rename from test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile rename to test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile
diff --git a/test cases/unit/91 install skip subprojects/subprojects/bar/meson.build b/test cases/unit/92 install skip subprojects/subprojects/bar/meson.build similarity index 100% rename from test cases/unit/91 install skip subprojects/subprojects/bar/meson.build rename to test cases/unit/92 install skip subprojects/subprojects/bar/meson.build
diff --git a/test cases/unit/92 new subproject in configured project/meson.build b/test cases/unit/93 new subproject in configured project/meson.build similarity index 100% rename from test cases/unit/92 new subproject in configured project/meson.build rename to test cases/unit/93 new subproject in configured project/meson.build
diff --git a/test cases/unit/92 new subproject in configured project/meson_options.txt b/test cases/unit/93 new subproject in configured project/meson_options.txt similarity index 100% rename from test cases/unit/92 new subproject in configured project/meson_options.txt rename to test cases/unit/93 new subproject in configured project/meson_options.txt
diff --git a/test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c b/test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c similarity index 100% rename from test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c rename to test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c
diff --git a/test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build b/test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build similarity index 100% rename from test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build rename to test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build
diff --git a/test cases/unit/93 clangformat/.clang-format b/test cases/unit/94 clangformat/.clang-format similarity index 100% rename from test cases/unit/93 clangformat/.clang-format rename to test cases/unit/94 clangformat/.clang-format
diff --git a/test cases/unit/93 clangformat/.clang-format-ignore b/test cases/unit/94 clangformat/.clang-format-ignore similarity index 100% rename from test cases/unit/93 clangformat/.clang-format-ignore rename to test cases/unit/94 clangformat/.clang-format-ignore
diff --git a/test cases/unit/93 clangformat/.clang-format-include b/test cases/unit/94 clangformat/.clang-format-include similarity index 100% rename from test cases/unit/93 clangformat/.clang-format-include rename to test cases/unit/94 clangformat/.clang-format-include
diff --git a/test cases/unit/93 clangformat/meson.build b/test cases/unit/94 clangformat/meson.build similarity index 100% rename from test cases/unit/93 clangformat/meson.build rename to test cases/unit/94 clangformat/meson.build
diff --git a/test cases/unit/93 clangformat/not-included/badformat.cpp b/test cases/unit/94 clangformat/not-included/badformat.cpp similarity index 100% rename from test cases/unit/93 clangformat/not-included/badformat.cpp rename to test cases/unit/94 clangformat/not-included/badformat.cpp
diff --git a/test cases/unit/93 clangformat/src/badformat.c b/test cases/unit/94 clangformat/src/badformat.c similarity index 100% rename from test cases/unit/93 clangformat/src/badformat.c rename to test cases/unit/94 clangformat/src/badformat.c
diff --git a/test cases/unit/93 clangformat/src/badformat.cpp b/test cases/unit/94 clangformat/src/badformat.cpp similarity index 100% rename from test cases/unit/93 clangformat/src/badformat.cpp rename to test cases/unit/94 clangformat/src/badformat.cpp
diff --git a/test cases/unit/94 custominc/easytogrepfor/genh.py b/test cases/unit/95 custominc/easytogrepfor/genh.py similarity index 100% rename from test cases/unit/94 custominc/easytogrepfor/genh.py rename to test cases/unit/95 custominc/easytogrepfor/genh.py
diff --git a/test cases/unit/94 custominc/easytogrepfor/meson.build b/test cases/unit/95 custominc/easytogrepfor/meson.build similarity index 100% rename from test cases/unit/94 custominc/easytogrepfor/meson.build rename to test cases/unit/95 custominc/easytogrepfor/meson.build
diff --git a/test cases/unit/94 custominc/helper.c b/test cases/unit/95 custominc/helper.c similarity index 100% rename from test cases/unit/94 custominc/helper.c rename to test cases/unit/95 custominc/helper.c
diff --git a/test cases/unit/94 custominc/meson.build b/test cases/unit/95 custominc/meson.build similarity index 100% rename from test cases/unit/94 custominc/meson.build rename to test cases/unit/95 custominc/meson.build
diff --git a/test cases/unit/94 custominc/prog.c b/test cases/unit/95 custominc/prog.c similarity index 100% rename from test cases/unit/94 custominc/prog.c rename to test cases/unit/95 custominc/prog.c
diff --git a/test cases/unit/94 custominc/prog2.c b/test cases/unit/95 custominc/prog2.c similarity index 100% rename from test cases/unit/94 custominc/prog2.c rename to test cases/unit/95 custominc/prog2.c
diff --git a/test cases/unit/95 implicit force fallback/meson.build b/test cases/unit/96 implicit force fallback/meson.build similarity index 100% rename from test cases/unit/95 implicit force fallback/meson.build rename to test cases/unit/96 implicit force fallback/meson.build
diff --git a/test cases/unit/95 implicit force fallback/subprojects/something/meson.build b/test cases/unit/96 implicit force fallback/subprojects/something/meson.build similarity index 100% rename from test cases/unit/95 implicit force fallback/subprojects/something/meson.build rename to test cases/unit/96 implicit force fallback/subprojects/something/meson.build
diff --git a/test cases/unit/96 compiler.links file arg/meson.build b/test cases/unit/97 compiler.links file arg/meson.build similarity index 100% rename from test cases/unit/96 compiler.links file arg/meson.build rename to test cases/unit/97 compiler.links file arg/meson.build
diff --git a/test cases/unit/96 compiler.links file arg/test.c b/test cases/unit/97 compiler.links file arg/test.c similarity index 100% rename from test cases/unit/96 compiler.links file arg/test.c rename to test cases/unit/97 compiler.links file arg/test.c
diff --git a/test cases/unit/97 link full name/.gitignore b/test cases/unit/98 link full name/.gitignore similarity index 100% rename from test cases/unit/97 link full name/.gitignore rename to test cases/unit/98 link full name/.gitignore
diff --git a/test cases/unit/97 link full name/libtestprovider/meson.build b/test cases/unit/98 link full name/libtestprovider/meson.build similarity index 100% rename from test cases/unit/97 link full name/libtestprovider/meson.build rename to test cases/unit/98 link full name/libtestprovider/meson.build
diff --git a/test cases/unit/97 link full name/libtestprovider/provider.c b/test cases/unit/98 link full name/libtestprovider/provider.c similarity index 100% rename from test cases/unit/97 link full name/libtestprovider/provider.c rename to test cases/unit/98 link full name/libtestprovider/provider.c
diff --git a/test cases/unit/97 link full name/proguser/meson.build b/test cases/unit/98 link full name/proguser/meson.build similarity index 100% rename from test cases/unit/97 link full name/proguser/meson.build rename to test cases/unit/98 link full name/proguser/meson.build
diff --git a/test cases/unit/97 link full name/proguser/receiver.c b/test cases/unit/98 link full name/proguser/receiver.c similarity index 100% rename from test cases/unit/97 link full name/proguser/receiver.c rename to test cases/unit/98 link full name/proguser/receiver.c
diff --git a/test cases/unit/98 install all targets/bar-custom.txt b/test cases/unit/99 install all targets/bar-custom.txt similarity index 100% rename from test cases/unit/98 install all targets/bar-custom.txt rename to test cases/unit/99 install all targets/bar-custom.txt
diff --git a/test cases/unit/98 install all targets/bar-devel.h b/test cases/unit/99 install all targets/bar-devel.h similarity index 100% rename from test cases/unit/98 install all targets/bar-devel.h rename to test cases/unit/99 install all targets/bar-devel.h
diff --git a/test cases/unit/98 install all targets/bar-notag.txt b/test cases/unit/99 install all targets/bar-notag.txt similarity index 100% rename from test cases/unit/98 install all targets/bar-notag.txt rename to test cases/unit/99 install all targets/bar-notag.txt
diff --git a/test cases/unit/98 install all targets/custom_files/data.txt b/test cases/unit/99 install all targets/custom_files/data.txt similarity index 100% rename from test cases/unit/98 install all targets/custom_files/data.txt rename to test cases/unit/99 install all targets/custom_files/data.txt
diff --git a/test cases/unit/98 install all targets/foo.in b/test cases/unit/99 install all targets/foo.in similarity index 100% rename from test cases/unit/98 install all targets/foo.in rename to test cases/unit/99 install all targets/foo.in
diff --git a/test cases/unit/98 install all targets/foo1-devel.h b/test cases/unit/99 install all targets/foo1-devel.h similarity index 100% rename from test cases/unit/98 install all targets/foo1-devel.h rename to test cases/unit/99 install all targets/foo1-devel.h
diff --git a/test cases/unit/98 install all targets/lib.c b/test cases/unit/99 install all targets/lib.c similarity index 100% rename from test cases/unit/98 install all targets/lib.c rename to test cases/unit/99 install all targets/lib.c
diff --git a/test cases/unit/98 install all targets/main.c b/test cases/unit/99 install all targets/main.c similarity index 100% rename from test cases/unit/98 install all targets/main.c rename to test cases/unit/99 install all targets/main.c
diff --git a/test cases/unit/98 install all targets/meson.build b/test cases/unit/99 install all targets/meson.build similarity index 100% rename from test cases/unit/98 install all targets/meson.build rename to test cases/unit/99 install all targets/meson.build
diff --git a/test cases/unit/98 install all targets/script.py b/test cases/unit/99 install all targets/script.py similarity index 100% rename from test cases/unit/98 install all targets/script.py rename to test cases/unit/99 install all targets/script.py
diff --git a/test cases/unit/98 install all targets/subdir/bar2-devel.h b/test cases/unit/99 install all targets/subdir/bar2-devel.h similarity index 100% rename from test cases/unit/98 install all targets/subdir/bar2-devel.h rename to test cases/unit/99 install all targets/subdir/bar2-devel.h
diff --git a/test cases/unit/98 install all targets/subdir/foo2.in b/test cases/unit/99 install all targets/subdir/foo2.in similarity index 100% rename from test cases/unit/98 install all targets/subdir/foo2.in rename to test cases/unit/99 install all targets/subdir/foo2.in
diff --git a/test cases/unit/98 install all targets/subdir/foo3-devel.h b/test cases/unit/99 install all targets/subdir/foo3-devel.h similarity index 100% rename from test cases/unit/98 install all targets/subdir/foo3-devel.h rename to test cases/unit/99 install all targets/subdir/foo3-devel.h
diff --git a/test cases/unit/98 install all targets/subdir/lib.c b/test cases/unit/99 install all targets/subdir/lib.c similarity index 100% rename from test cases/unit/98 install all targets/subdir/lib.c rename to test cases/unit/99 install all targets/subdir/lib.c
diff --git a/test cases/unit/98 install all targets/subdir/main.c b/test cases/unit/99 install all targets/subdir/main.c similarity index 100% rename from test cases/unit/98 install all targets/subdir/main.c rename to test cases/unit/99 install all targets/subdir/main.c
diff --git a/test cases/unit/98 install all targets/subdir/meson.build b/test cases/unit/99 install all targets/subdir/meson.build similarity index 100% rename from test cases/unit/98 install all targets/subdir/meson.build rename to test cases/unit/99 install all targets/subdir/meson.build
diff --git a/test cases/unit/98 install all targets/subdir/script.py b/test cases/unit/99 install all targets/subdir/script.py similarity index 100% rename from test cases/unit/98 install all targets/subdir/script.py rename to test cases/unit/99 install all targets/subdir/script.py
diff --git a/test cases/windows/18 msvc cplusplus define/main.cpp b/test cases/windows/19 msvc cplusplus define/main.cpp similarity index 100% rename from test cases/windows/18 msvc cplusplus define/main.cpp rename to test cases/windows/19 msvc cplusplus define/main.cpp
diff --git a/test cases/windows/18 msvc cplusplus define/meson.build b/test cases/windows/19 msvc cplusplus define/meson.build similarity index 100% rename from test cases/windows/18 msvc cplusplus define/meson.build rename to test cases/windows/19 msvc cplusplus define/meson.build
diff --git a/test cases/windows/19 vs install static lib with generated obj deps/both_lib_source.c b/test cases/windows/20 vs install static lib with generated obj deps/both_lib_source.c similarity index 100% rename from test cases/windows/19 vs install static lib with generated obj deps/both_lib_source.c rename to test cases/windows/20 vs install static lib with generated obj deps/both_lib_source.c
diff --git a/test cases/windows/19 vs install static lib with generated obj deps/copyfile.py b/test cases/windows/20 vs install static lib with generated obj deps/copyfile.py similarity index 100% rename from test cases/windows/19 vs install static lib with generated obj deps/copyfile.py rename to test cases/windows/20 vs install static lib with generated obj deps/copyfile.py
diff --git a/test cases/windows/19 vs install static lib with generated obj deps/generated_source.c b/test cases/windows/20 vs install static lib with generated obj deps/generated_source.c similarity index 100% rename from test cases/windows/19 vs install static lib with generated obj deps/generated_source.c rename to test cases/windows/20 vs install static lib with generated obj deps/generated_source.c
diff --git a/test cases/windows/19 vs install static lib with generated obj deps/meson.build b/test cases/windows/20 vs install static lib with generated obj deps/meson.build similarity index 100% rename from test cases/windows/19 vs install static lib with generated obj deps/meson.build rename to test cases/windows/20 vs install static lib with generated obj deps/meson.build
diff --git a/test cases/windows/19 vs install static lib with generated obj deps/static_lib_source.c b/test cases/windows/20 vs install static lib with generated obj deps/static_lib_source.c similarity index 100% rename from test cases/windows/19 vs install static lib with generated obj deps/static_lib_source.c rename to test cases/windows/20 vs install static lib with generated obj deps/static_lib_source.c
diff --git a/test cases/windows/19 vs install static lib with generated obj deps/test.json b/test cases/windows/20 vs install static lib with generated obj deps/test.json similarity index 100% rename from test cases/windows/19 vs install static lib with generated obj deps/test.json rename to test cases/windows/20 vs install static lib with generated obj deps/test.json
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index 6e2f22d..6d8febb 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py
@@ -539,7 +539,7 @@ self.run_tests() def test_implicit_forcefallback(self): - testdir = os.path.join(self.unit_test_dir, '95 implicit force fallback') + testdir = os.path.join(self.unit_test_dir, '96 implicit force fallback') with self.assertRaises(subprocess.CalledProcessError): self.init(testdir) self.init(testdir, extra_args=['--wrap-mode=forcefallback']) @@ -1664,7 +1664,7 @@ check_pcfile('libvartest2.pc', relocatable=False) self.wipe() - testdir_abs = os.path.join(self.unit_test_dir, '105 pkgconfig relocatable with absolute path') + testdir_abs = os.path.join(self.unit_test_dir, '106 pkgconfig relocatable with absolute path') self.init(testdir_abs) check_pcfile('libsimple.pc', relocatable=True, levels=3) @@ -2019,7 +2019,7 @@ self.assertIn(msg, out) def test_mixed_language_linker_check(self): - testdir = os.path.join(self.unit_test_dir, '96 compiler.links file arg') + testdir = os.path.join(self.unit_test_dir, '97 compiler.links file arg') self.init(testdir) cmds = self.get_meson_log_compiler_checks() self.assertEqual(len(cmds), 5) @@ -3768,7 +3768,7 @@ self.init(srcdir, extra_args=['-Dbuild.b_lto=true']) def test_install_skip_subprojects(self): - testdir = os.path.join(self.unit_test_dir, '91 install skip subprojects') + testdir = os.path.join(self.unit_test_dir, '92 install skip subprojects') self.init(testdir) self.build() @@ -3814,7 +3814,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, '92 new subproject in configured project') + srcdir = os.path.join(self.unit_test_dir, '93 new subproject in configured project') self.init(srcdir) self.build() self.setconf('-Duse-sub=true') @@ -3837,7 +3837,7 @@ if not shutil.which('clang-format'): raise SkipTest('clang-format not found') - testdir = os.path.join(self.unit_test_dir, '93 clangformat') + testdir = os.path.join(self.unit_test_dir, '94 clangformat') newdir = os.path.join(self.builddir, 'testdir') shutil.copytree(testdir, newdir) self.new_builddir() @@ -3862,7 +3862,7 @@ self.build('clang-format-check') def test_custom_target_implicit_include(self): - testdir = os.path.join(self.unit_test_dir, '94 custominc') + testdir = os.path.join(self.unit_test_dir, '95 custominc') self.init(testdir) self.build() compdb = self.get_compdb() @@ -3902,7 +3902,7 @@ self.assertEqual(sorted(link_args), sorted(['-flto'])) def test_install_tag(self) -> None: - testdir = os.path.join(self.unit_test_dir, '98 install all targets') + testdir = os.path.join(self.unit_test_dir, '99 install all targets') self.init(testdir) self.build() @@ -4049,7 +4049,7 @@ do_install(None, expected_all, 2) def test_introspect_install_plan(self): - testdir = os.path.join(self.unit_test_dir, '98 install all targets') + testdir = os.path.join(self.unit_test_dir, '99 install all targets') introfile = os.path.join(self.builddir, 'meson-info', 'intro-install_plan.json') self.init(testdir) self.assertPathExists(introfile) @@ -4245,7 +4245,7 @@ }} ''') - testdir = os.path.join(self.unit_test_dir, '101 rlib linkage') + testdir = os.path.join(self.unit_test_dir, '102 rlib linkage') gen_file = os.path.join(testdir, 'lib.rs') with open(gen_file, 'w') as f: f.write(template.format(0)) @@ -4265,7 +4265,7 @@ self.assertIn('exit status 39', cm.exception.stdout) def test_custom_target_name(self): - testdir = os.path.join(self.unit_test_dir, '99 custom target name') + testdir = os.path.join(self.unit_test_dir, '100 custom target name') self.init(testdir) out = self.build() if self.backend is Backend.ninja: @@ -4273,7 +4273,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, '106 subproject symlink') + testdir = os.path.join(self.unit_test_dir, '107 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')
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index f120590..76721aa 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py
@@ -1351,7 +1351,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, '97 link full name','libtestprovider') + testdir = os.path.join(self.unit_test_dir, '98 link full name','libtestprovider') oldprefix = self.prefix # install into installdir without using DESTDIR installdir = self.installdir @@ -1364,7 +1364,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, '97 link full name','proguser') + testdir = os.path.join(self.unit_test_dir, '98 link full name','proguser') self.init(testdir,override_envvars=env) # test for link with full path @@ -1776,7 +1776,7 @@ @skipUnless(is_linux(), 'Test only applicable to Linux') def test_install_strip(self): - testdir = os.path.join(self.unit_test_dir, '103 strip') + testdir = os.path.join(self.unit_test_dir, '104 strip') self.init(testdir) self.build()
diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py index 4b99b2f..a2d6640 100644 --- a/unittests/platformagnostictests.py +++ b/unittests/platformagnostictests.py
@@ -32,7 +32,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, '100 relative find program') + testdir = os.path.join(self.unit_test_dir, '101 relative find program') self.init(testdir, workdir=testdir) def test_invalid_option_names(self): @@ -68,11 +68,11 @@ interp.process(fname) def test_python_dependency_without_pkgconfig(self): - testdir = os.path.join(self.unit_test_dir, '102 python without pkgconfig') + testdir = os.path.join(self.unit_test_dir, '103 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, '104 debug function') + testdir = os.path.join(self.unit_test_dir, '105 debug function') log_msg = 'This is an example debug output, should only end up in debug log' output = self.init(testdir) @@ -85,7 +85,7 @@ self.assertIn(log_msg, file.read()) def test_new_subproject_reconfigure(self): - testdir = os.path.join(self.unit_test_dir, '107 new subproject on reconfigure') + testdir = os.path.join(self.unit_test_dir, '108 new subproject on reconfigure') self.init(testdir) self.build()