diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2023-11-12 17:23:28 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2023-11-12 19:18:06 +0200 |
| commit | 97dc8801a691b0712b59d283416727c3f84b1115 (patch) | |
| tree | 9d0ac3921375dcad541cc0b144efc5148c0254ac | |
| parent | 422550036ea20061a60b29f695b2d1865667f012 (diff) | |
| download | meson-97dc8801a691b0712b59d283416727c3f84b1115.tar.gz | |
Renumber test dirs for rc3.
| -rw-r--r-- | test cases/rust/21 transitive dependencies/diamond/func.c (renamed from test cases/rust/20 transitive dependencies/diamond/func.c) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/diamond/main.c (renamed from test cases/rust/20 transitive dependencies/diamond/main.c) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/diamond/meson.build (renamed from test cases/rust/20 transitive dependencies/diamond/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/diamond/r1.rs (renamed from test cases/rust/20 transitive dependencies/diamond/r1.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/diamond/r2.rs (renamed from test cases/rust/20 transitive dependencies/diamond/r2.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/diamond/r3.rs (renamed from test cases/rust/20 transitive dependencies/diamond/r3.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/foo.c (renamed from test cases/rust/20 transitive dependencies/foo.c) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/foo.rs (renamed from test cases/rust/20 transitive dependencies/foo.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/liba/lib.rs (renamed from test cases/rust/20 transitive dependencies/liba/lib.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/liba/meson.build (renamed from test cases/rust/20 transitive dependencies/liba/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/libb/lib.rs (renamed from test cases/rust/20 transitive dependencies/libb/lib.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/libb/meson.build (renamed from test cases/rust/20 transitive dependencies/libb/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/main.rs (renamed from test cases/rust/20 transitive dependencies/main.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/meson.build (renamed from test cases/rust/20 transitive dependencies/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/proc.rs (renamed from test cases/rust/20 transitive dependencies/proc.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/21 transitive dependencies/test.json (renamed from test cases/rust/20 transitive dependencies/test.json) | 0 | ||||
| -rw-r--r-- | test cases/rust/22 cargo subproject/main.c (renamed from test cases/rust/21 cargo subproject/main.c) | 0 | ||||
| -rw-r--r-- | test cases/rust/22 cargo subproject/meson.build (renamed from test cases/rust/21 cargo subproject/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/bar-rs.wrap (renamed from test cases/rust/21 cargo subproject/subprojects/bar-rs.wrap) | 0 | ||||
| -rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/bar-rs/Cargo.toml (renamed from test cases/rust/21 cargo subproject/subprojects/bar-rs/Cargo.toml) | 0 | ||||
| -rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/bar-rs/src/lib.rs (renamed from test cases/rust/21 cargo subproject/subprojects/bar-rs/src/lib.rs) | 0 | ||||
| -rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/foo-rs.wrap (renamed from test cases/rust/21 cargo subproject/subprojects/foo-rs.wrap) | 0 | ||||
| -rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml (renamed from test cases/rust/21 cargo subproject/subprojects/foo-rs/Cargo.toml) | 0 | ||||
| -rw-r--r-- | test cases/rust/22 cargo subproject/subprojects/foo-rs/src/lib.rs (renamed from test cases/rust/21 cargo subproject/subprojects/foo-rs/src/lib.rs) | 0 | ||||
| -rw-r--r-- | test cases/unit/100 custom target name/file.txt.in (renamed from test cases/unit/99 custom target name/file.txt.in) | 0 | ||||
| -rw-r--r-- | test cases/unit/100 custom target name/meson.build (renamed from test cases/unit/99 custom target name/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/100 custom target name/subdir/meson.build (renamed from test cases/unit/99 custom target name/subdir/meson.build) | 0 | ||||
| -rwxr-xr-x | test cases/unit/101 relative find program/foo.py (renamed from test cases/unit/100 relative find program/foo.py) | 0 | ||||
| -rw-r--r-- | test cases/unit/101 relative find program/meson.build (renamed from test cases/unit/100 relative find program/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/101 relative find program/subdir/meson.build (renamed from test cases/unit/100 relative find program/subdir/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/102 rlib linkage/lib2.rs (renamed from test cases/unit/101 rlib linkage/lib2.rs) | 0 | ||||
| -rw-r--r-- | test cases/unit/102 rlib linkage/main.rs (renamed from test cases/unit/101 rlib linkage/main.rs) | 0 | ||||
| -rw-r--r-- | test cases/unit/102 rlib linkage/meson.build (renamed from test cases/unit/101 rlib linkage/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/103 python without pkgconfig/meson.build (renamed from test cases/unit/102 python without pkgconfig/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/104 strip/lib.c (renamed from test cases/unit/103 strip/lib.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/104 strip/meson.build (renamed from test cases/unit/103 strip/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/105 debug function/meson.build (renamed from test cases/unit/104 debug function/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/106 pkgconfig relocatable with absolute path/meson.build (renamed from test cases/unit/105 pkgconfig relocatable with absolute path/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/foo.c (renamed from test cases/unit/91 install skip subprojects/foo.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/foo.dat (renamed from test cases/unit/91 install skip subprojects/foo.dat) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/foo.h (renamed from test cases/unit/91 install skip subprojects/foo.h) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/foo/foofile (renamed from test cases/unit/91 install skip subprojects/foo/foofile) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/meson.build (renamed from test cases/unit/91 install skip subprojects/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/subprojects/bar/bar.c (renamed from test cases/unit/91 install skip subprojects/subprojects/bar/bar.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat (renamed from test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/subprojects/bar/bar.h (renamed from test cases/unit/91 install skip subprojects/subprojects/bar/bar.h) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile (renamed from test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile) | 0 | ||||
| -rw-r--r-- | test cases/unit/92 install skip subprojects/subprojects/bar/meson.build (renamed from test cases/unit/91 install skip subprojects/subprojects/bar/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/93 new subproject in configured project/meson.build (renamed from test cases/unit/92 new subproject in configured project/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/93 new subproject in configured project/meson_options.txt (renamed from test cases/unit/92 new subproject in configured project/meson_options.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c (renamed from test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build (renamed from test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/94 clangformat/.clang-format (renamed from test cases/unit/93 clangformat/.clang-format) | 0 | ||||
| -rw-r--r-- | test cases/unit/94 clangformat/.clang-format-ignore (renamed from test cases/unit/93 clangformat/.clang-format-ignore) | 0 | ||||
| -rw-r--r-- | test cases/unit/94 clangformat/.clang-format-include (renamed from test cases/unit/93 clangformat/.clang-format-include) | 0 | ||||
| -rw-r--r-- | test cases/unit/94 clangformat/meson.build (renamed from test cases/unit/93 clangformat/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/94 clangformat/not-included/badformat.cpp (renamed from test cases/unit/93 clangformat/not-included/badformat.cpp) | 0 | ||||
| -rw-r--r-- | test cases/unit/94 clangformat/src/badformat.c (renamed from test cases/unit/93 clangformat/src/badformat.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/94 clangformat/src/badformat.cpp (renamed from test cases/unit/93 clangformat/src/badformat.cpp) | 0 | ||||
| -rw-r--r-- | test cases/unit/95 custominc/easytogrepfor/genh.py (renamed from test cases/unit/94 custominc/easytogrepfor/genh.py) | 0 | ||||
| -rw-r--r-- | test cases/unit/95 custominc/easytogrepfor/meson.build (renamed from test cases/unit/94 custominc/easytogrepfor/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/95 custominc/helper.c (renamed from test cases/unit/94 custominc/helper.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/95 custominc/meson.build (renamed from test cases/unit/94 custominc/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/95 custominc/prog.c (renamed from test cases/unit/94 custominc/prog.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/95 custominc/prog2.c (renamed from test cases/unit/94 custominc/prog2.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/96 implicit force fallback/meson.build (renamed from test cases/unit/95 implicit force fallback/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/96 implicit force fallback/subprojects/something/meson.build (renamed from test cases/unit/95 implicit force fallback/subprojects/something/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/97 compiler.links file arg/meson.build (renamed from test cases/unit/96 compiler.links file arg/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/97 compiler.links file arg/test.c (renamed from test cases/unit/96 compiler.links file arg/test.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/98 link full name/.gitignore (renamed from test cases/unit/97 link full name/.gitignore) | 0 | ||||
| -rw-r--r-- | test cases/unit/98 link full name/libtestprovider/meson.build (renamed from test cases/unit/97 link full name/libtestprovider/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/98 link full name/libtestprovider/provider.c (renamed from test cases/unit/97 link full name/libtestprovider/provider.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/98 link full name/proguser/meson.build (renamed from test cases/unit/97 link full name/proguser/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/98 link full name/proguser/receiver.c (renamed from test cases/unit/97 link full name/proguser/receiver.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/bar-custom.txt (renamed from test cases/unit/98 install all targets/bar-custom.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/bar-devel.h (renamed from test cases/unit/98 install all targets/bar-devel.h) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/bar-notag.txt (renamed from test cases/unit/98 install all targets/bar-notag.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/custom_files/data.txt (renamed from test cases/unit/98 install all targets/custom_files/data.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/excludes/excluded.txt (renamed from test cases/unit/98 install all targets/excludes/excluded.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/excludes/excluded/placeholder.txt (renamed from test cases/unit/98 install all targets/excludes/excluded/placeholder.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/excludes/installed.txt (renamed from test cases/unit/98 install all targets/excludes/installed.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/foo.in (renamed from test cases/unit/98 install all targets/foo.in) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/foo1-devel.h (renamed from test cases/unit/98 install all targets/foo1-devel.h) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/lib.c (renamed from test cases/unit/98 install all targets/lib.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/main.c (renamed from test cases/unit/98 install all targets/main.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/meson.build (renamed from test cases/unit/98 install all targets/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/script.py (renamed from test cases/unit/98 install all targets/script.py) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subdir/bar2-devel.h (renamed from test cases/unit/98 install all targets/subdir/bar2-devel.h) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subdir/foo2.in (renamed from test cases/unit/98 install all targets/subdir/foo2.in) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subdir/foo3-devel.h (renamed from test cases/unit/98 install all targets/subdir/foo3-devel.h) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subdir/lib.c (renamed from test cases/unit/98 install all targets/subdir/lib.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subdir/main.c (renamed from test cases/unit/98 install all targets/subdir/main.c) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subdir/meson.build (renamed from test cases/unit/98 install all targets/subdir/meson.build) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subdir/script.py (renamed from test cases/unit/98 install all targets/subdir/script.py) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subprojects/subproject/aaa.txt (renamed from test cases/unit/98 install all targets/subprojects/subproject/aaa.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subprojects/subproject/bbb.txt (renamed from test cases/unit/98 install all targets/subprojects/subproject/bbb.txt) | 0 | ||||
| -rw-r--r-- | test cases/unit/99 install all targets/subprojects/subproject/meson.build (renamed from test cases/unit/98 install all targets/subprojects/subproject/meson.build) | 0 | ||||
| -rw-r--r-- | unittests/allplatformstests.py | 22 | ||||
| -rw-r--r-- | unittests/linuxliketests.py | 6 | ||||
| -rw-r--r-- | unittests/platformagnostictests.py | 6 |
100 files changed, 17 insertions, 17 deletions
diff --git a/test cases/rust/20 transitive dependencies/diamond/func.c b/test cases/rust/21 transitive dependencies/diamond/func.c index c07ab728d..c07ab728d 100644 --- a/test cases/rust/20 transitive dependencies/diamond/func.c +++ b/test cases/rust/21 transitive dependencies/diamond/func.c diff --git a/test cases/rust/20 transitive dependencies/diamond/main.c b/test cases/rust/21 transitive dependencies/diamond/main.c index c633e9ae5..c633e9ae5 100644 --- a/test cases/rust/20 transitive dependencies/diamond/main.c +++ b/test cases/rust/21 transitive dependencies/diamond/main.c diff --git a/test cases/rust/20 transitive dependencies/diamond/meson.build b/test cases/rust/21 transitive dependencies/diamond/meson.build index dc48d4523..dc48d4523 100644 --- a/test cases/rust/20 transitive dependencies/diamond/meson.build +++ b/test cases/rust/21 transitive dependencies/diamond/meson.build diff --git a/test cases/rust/20 transitive dependencies/diamond/r1.rs b/test cases/rust/21 transitive dependencies/diamond/r1.rs index 7afb71109..7afb71109 100644 --- a/test cases/rust/20 transitive dependencies/diamond/r1.rs +++ b/test cases/rust/21 transitive dependencies/diamond/r1.rs diff --git a/test cases/rust/20 transitive dependencies/diamond/r2.rs b/test cases/rust/21 transitive dependencies/diamond/r2.rs index ee73ee2e2..ee73ee2e2 100644 --- a/test cases/rust/20 transitive dependencies/diamond/r2.rs +++ b/test cases/rust/21 transitive dependencies/diamond/r2.rs diff --git a/test cases/rust/20 transitive dependencies/diamond/r3.rs b/test cases/rust/21 transitive dependencies/diamond/r3.rs index 9794b7eda..9794b7eda 100644 --- a/test cases/rust/20 transitive dependencies/diamond/r3.rs +++ b/test cases/rust/21 transitive dependencies/diamond/r3.rs diff --git a/test cases/rust/20 transitive dependencies/foo.c b/test cases/rust/21 transitive dependencies/foo.c index e40878a87..e40878a87 100644 --- a/test cases/rust/20 transitive dependencies/foo.c +++ b/test cases/rust/21 transitive dependencies/foo.c diff --git a/test cases/rust/20 transitive dependencies/foo.rs b/test cases/rust/21 transitive dependencies/foo.rs index 8e3863853..8e3863853 100644 --- a/test cases/rust/20 transitive dependencies/foo.rs +++ b/test cases/rust/21 transitive dependencies/foo.rs diff --git a/test cases/rust/20 transitive dependencies/liba/lib.rs b/test cases/rust/21 transitive dependencies/liba/lib.rs index 0fc8ce55f..0fc8ce55f 100644 --- a/test cases/rust/20 transitive dependencies/liba/lib.rs +++ b/test cases/rust/21 transitive dependencies/liba/lib.rs diff --git a/test cases/rust/20 transitive dependencies/liba/meson.build b/test cases/rust/21 transitive dependencies/liba/meson.build index b32822db9..b32822db9 100644 --- a/test cases/rust/20 transitive dependencies/liba/meson.build +++ b/test cases/rust/21 transitive dependencies/liba/meson.build diff --git a/test cases/rust/20 transitive dependencies/libb/lib.rs b/test cases/rust/21 transitive dependencies/libb/lib.rs index e97463b92..e97463b92 100644 --- a/test cases/rust/20 transitive dependencies/libb/lib.rs +++ b/test cases/rust/21 transitive dependencies/libb/lib.rs diff --git a/test cases/rust/20 transitive dependencies/libb/meson.build b/test cases/rust/21 transitive dependencies/libb/meson.build index 67947e73a..67947e73a 100644 --- a/test cases/rust/20 transitive dependencies/libb/meson.build +++ b/test cases/rust/21 transitive dependencies/libb/meson.build diff --git a/test cases/rust/20 transitive dependencies/main.rs b/test cases/rust/21 transitive dependencies/main.rs index 4b248456c..4b248456c 100644 --- a/test cases/rust/20 transitive dependencies/main.rs +++ b/test cases/rust/21 transitive dependencies/main.rs diff --git a/test cases/rust/20 transitive dependencies/meson.build b/test cases/rust/21 transitive dependencies/meson.build index b786e6494..b786e6494 100644 --- a/test cases/rust/20 transitive dependencies/meson.build +++ b/test cases/rust/21 transitive dependencies/meson.build diff --git a/test cases/rust/20 transitive dependencies/proc.rs b/test cases/rust/21 transitive dependencies/proc.rs index 53935e45d..53935e45d 100644 --- a/test cases/rust/20 transitive dependencies/proc.rs +++ b/test cases/rust/21 transitive dependencies/proc.rs diff --git a/test cases/rust/20 transitive dependencies/test.json b/test cases/rust/21 transitive dependencies/test.json index 0d98c230a..0d98c230a 100644 --- a/test cases/rust/20 transitive dependencies/test.json +++ b/test cases/rust/21 transitive dependencies/test.json diff --git a/test cases/rust/21 cargo subproject/main.c b/test cases/rust/22 cargo subproject/main.c index 5daec64e3..5daec64e3 100644 --- a/test cases/rust/21 cargo subproject/main.c +++ b/test cases/rust/22 cargo subproject/main.c diff --git a/test cases/rust/21 cargo subproject/meson.build b/test cases/rust/22 cargo subproject/meson.build index 420e6e3b9..420e6e3b9 100644 --- a/test cases/rust/21 cargo subproject/meson.build +++ b/test cases/rust/22 cargo subproject/meson.build diff --git a/test cases/rust/21 cargo subproject/subprojects/bar-rs.wrap b/test cases/rust/22 cargo subproject/subprojects/bar-rs.wrap index 99686e90e..99686e90e 100644 --- a/test cases/rust/21 cargo subproject/subprojects/bar-rs.wrap +++ b/test cases/rust/22 cargo subproject/subprojects/bar-rs.wrap diff --git a/test cases/rust/21 cargo subproject/subprojects/bar-rs/Cargo.toml b/test cases/rust/22 cargo subproject/subprojects/bar-rs/Cargo.toml index 232b4d7d4..232b4d7d4 100644 --- a/test cases/rust/21 cargo subproject/subprojects/bar-rs/Cargo.toml +++ b/test cases/rust/22 cargo subproject/subprojects/bar-rs/Cargo.toml diff --git a/test cases/rust/21 cargo subproject/subprojects/bar-rs/src/lib.rs b/test cases/rust/22 cargo subproject/subprojects/bar-rs/src/lib.rs index 5b64db8cc..5b64db8cc 100644 --- a/test cases/rust/21 cargo subproject/subprojects/bar-rs/src/lib.rs +++ b/test cases/rust/22 cargo subproject/subprojects/bar-rs/src/lib.rs diff --git a/test cases/rust/21 cargo subproject/subprojects/foo-rs.wrap b/test cases/rust/22 cargo subproject/subprojects/foo-rs.wrap index 99686e90e..99686e90e 100644 --- a/test cases/rust/21 cargo subproject/subprojects/foo-rs.wrap +++ b/test cases/rust/22 cargo subproject/subprojects/foo-rs.wrap diff --git a/test cases/rust/21 cargo subproject/subprojects/foo-rs/Cargo.toml b/test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml index 214c3279c..214c3279c 100644 --- a/test cases/rust/21 cargo subproject/subprojects/foo-rs/Cargo.toml +++ b/test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml diff --git a/test cases/rust/21 cargo subproject/subprojects/foo-rs/src/lib.rs b/test cases/rust/22 cargo subproject/subprojects/foo-rs/src/lib.rs index 732d7d20b..732d7d20b 100644 --- a/test cases/rust/21 cargo subproject/subprojects/foo-rs/src/lib.rs +++ b/test cases/rust/22 cargo subproject/subprojects/foo-rs/src/lib.rs diff --git a/test cases/unit/99 custom target name/file.txt.in b/test cases/unit/100 custom target name/file.txt.in index e69de29bb..e69de29bb 100644 --- a/test cases/unit/99 custom target name/file.txt.in +++ b/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 index 82876149f..82876149f 100644 --- a/test cases/unit/99 custom target name/meson.build +++ b/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 index 785a7b366..785a7b366 100644 --- a/test cases/unit/99 custom target name/subdir/meson.build +++ b/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 index 21239b74b..21239b74b 100755 --- a/test cases/unit/100 relative find program/foo.py +++ b/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 index 5745d8acb..5745d8acb 100644 --- a/test cases/unit/100 relative find program/meson.build +++ b/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 index 475f5f51c..475f5f51c 100644 --- a/test cases/unit/100 relative find program/subdir/meson.build +++ b/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 index 3487bc5a9..3487bc5a9 100644 --- a/test cases/unit/101 rlib linkage/lib2.rs +++ b/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 index d0f82e4e1..d0f82e4e1 100644 --- a/test cases/unit/101 rlib linkage/main.rs +++ b/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 index 2d15b2a14..2d15b2a14 100644 --- a/test cases/unit/101 rlib linkage/meson.build +++ b/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 index 014a61751..014a61751 100644 --- a/test cases/unit/102 python without pkgconfig/meson.build +++ b/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 index 7d8163c3b..7d8163c3b 100644 --- a/test cases/unit/103 strip/lib.c +++ b/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 index dff61ab43..dff61ab43 100644 --- a/test cases/unit/103 strip/meson.build +++ b/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 index c3f4c769f..c3f4c769f 100644 --- a/test cases/unit/104 debug function/meson.build +++ b/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 index ff2128624..ff2128624 100644 --- a/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build +++ b/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build diff --git a/test cases/unit/91 install skip subprojects/foo.c b/test cases/unit/92 install skip subprojects/foo.c index 25927f5a1..25927f5a1 100644 --- a/test cases/unit/91 install skip subprojects/foo.c +++ b/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 index 421376db9..421376db9 100644 --- a/test cases/unit/91 install skip subprojects/foo.dat +++ b/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 index a7e26ac6c..a7e26ac6c 100644 --- a/test cases/unit/91 install skip subprojects/foo.h +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test cases/unit/91 install skip subprojects/foo/foofile +++ b/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 index cfbae9483..cfbae9483 100644 --- a/test cases/unit/91 install skip subprojects/meson.build +++ b/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 index 25927f5a1..25927f5a1 100644 --- a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.c +++ b/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 index 421376db9..421376db9 100644 --- a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat +++ b/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 index a7e26ac6c..a7e26ac6c 100644 --- a/test cases/unit/91 install skip subprojects/subprojects/bar/bar.h +++ b/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 index 421376db9..421376db9 100644 --- a/test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile +++ b/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 index b5b073408..b5b073408 100644 --- a/test cases/unit/91 install skip subprojects/subprojects/bar/meson.build +++ b/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 index b82aa4173..b82aa4173 100644 --- a/test cases/unit/92 new subproject in configured project/meson.build +++ b/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 index 12d8395d4..12d8395d4 100644 --- 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 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 index 9713d9f7f..9713d9f7f 100644 --- 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 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 index a833b0c35..a833b0c35 100644 --- 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 diff --git a/test cases/unit/93 clangformat/.clang-format b/test cases/unit/94 clangformat/.clang-format index 689bc6047..689bc6047 100644 --- a/test cases/unit/93 clangformat/.clang-format +++ b/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 index 7fc4d5a95..7fc4d5a95 100644 --- a/test cases/unit/93 clangformat/.clang-format-ignore +++ b/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 index f057c0033..f057c0033 100644 --- a/test cases/unit/93 clangformat/.clang-format-include +++ b/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 index 8f4af981b..8f4af981b 100644 --- a/test cases/unit/93 clangformat/meson.build +++ b/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 index 99a0ea60c..99a0ea60c 100644 --- a/test cases/unit/93 clangformat/not-included/badformat.cpp +++ b/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 index f1d18b7ed..f1d18b7ed 100644 --- a/test cases/unit/93 clangformat/src/badformat.c +++ b/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 index 99a0ea60c..99a0ea60c 100644 --- a/test cases/unit/93 clangformat/src/badformat.cpp +++ b/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 index 48e033a72..48e033a72 100644 --- a/test cases/unit/94 custominc/easytogrepfor/genh.py +++ b/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 index e749753bc..e749753bc 100644 --- a/test cases/unit/94 custominc/easytogrepfor/meson.build +++ b/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 index 3237441bc..3237441bc 100644 --- a/test cases/unit/94 custominc/helper.c +++ b/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 index bab113908..bab113908 100644 --- a/test cases/unit/94 custominc/meson.build +++ b/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 index db9df9d5e..db9df9d5e 100644 --- a/test cases/unit/94 custominc/prog.c +++ b/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 index e64b22919..e64b22919 100644 --- a/test cases/unit/94 custominc/prog2.c +++ b/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 index 623a338db..623a338db 100644 --- a/test cases/unit/95 implicit force fallback/meson.build +++ b/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 index 89a4727dc..89a4727dc 100644 --- a/test cases/unit/95 implicit force fallback/subprojects/something/meson.build +++ b/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 index c409dcbd1..c409dcbd1 100644 --- a/test cases/unit/96 compiler.links file arg/meson.build +++ b/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 index 78f2de106..78f2de106 100644 --- a/test cases/unit/96 compiler.links file arg/test.c +++ b/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 index 812960172..812960172 100644 --- a/test cases/unit/97 link full name/.gitignore +++ b/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 index 128c213ac..128c213ac 100644 --- a/test cases/unit/97 link full name/libtestprovider/meson.build +++ b/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 index 5e79966f7..5e79966f7 100644 --- a/test cases/unit/97 link full name/libtestprovider/provider.c +++ b/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 index 5be5bc998..5be5bc998 100644 --- a/test cases/unit/97 link full name/proguser/meson.build +++ b/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 index d661ae4ca..d661ae4ca 100644 --- a/test cases/unit/97 link full name/proguser/receiver.c +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test cases/unit/98 install all targets/bar-custom.txt +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test cases/unit/98 install all targets/bar-devel.h +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test cases/unit/98 install all targets/bar-notag.txt +++ b/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 index 557db03de..557db03de 100644 --- a/test cases/unit/98 install all targets/custom_files/data.txt +++ b/test cases/unit/99 install all targets/custom_files/data.txt diff --git a/test cases/unit/98 install all targets/excludes/excluded.txt b/test cases/unit/99 install all targets/excludes/excluded.txt index 59b064403..59b064403 100644 --- a/test cases/unit/98 install all targets/excludes/excluded.txt +++ b/test cases/unit/99 install all targets/excludes/excluded.txt diff --git a/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt b/test cases/unit/99 install all targets/excludes/excluded/placeholder.txt index 3b94f9157..3b94f9157 100644 --- a/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt +++ b/test cases/unit/99 install all targets/excludes/excluded/placeholder.txt diff --git a/test cases/unit/98 install all targets/excludes/installed.txt b/test cases/unit/99 install all targets/excludes/installed.txt index 84376928c..84376928c 100644 --- a/test cases/unit/98 install all targets/excludes/installed.txt +++ b/test cases/unit/99 install all targets/excludes/installed.txt diff --git a/test cases/unit/98 install all targets/foo.in b/test cases/unit/99 install all targets/foo.in index e69de29bb..e69de29bb 100644 --- a/test cases/unit/98 install all targets/foo.in +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test cases/unit/98 install all targets/foo1-devel.h +++ b/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 index 2ea9c7dd1..2ea9c7dd1 100644 --- a/test cases/unit/98 install all targets/lib.c +++ b/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 index 0fb4389f7..0fb4389f7 100644 --- a/test cases/unit/98 install all targets/main.c +++ b/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 index c5f33a054..c5f33a054 100644 --- a/test cases/unit/98 install all targets/meson.build +++ b/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 index c5f3be9ed..c5f3be9ed 100644 --- a/test cases/unit/98 install all targets/script.py +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test cases/unit/98 install all targets/subdir/bar2-devel.h +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test cases/unit/98 install all targets/subdir/foo2.in +++ b/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 index e69de29bb..e69de29bb 100644 --- a/test cases/unit/98 install all targets/subdir/foo3-devel.h +++ b/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 index 2ea9c7dd1..2ea9c7dd1 100644 --- a/test cases/unit/98 install all targets/subdir/lib.c +++ b/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 index 0fb4389f7..0fb4389f7 100644 --- a/test cases/unit/98 install all targets/subdir/main.c +++ b/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 index 53c796abe..53c796abe 100644 --- a/test cases/unit/98 install all targets/subdir/meson.build +++ b/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 index c5f3be9ed..c5f3be9ed 100644 --- a/test cases/unit/98 install all targets/subdir/script.py +++ b/test cases/unit/99 install all targets/subdir/script.py diff --git a/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt b/test cases/unit/99 install all targets/subprojects/subproject/aaa.txt index 43d5a8ed6..43d5a8ed6 100644 --- a/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt +++ b/test cases/unit/99 install all targets/subprojects/subproject/aaa.txt diff --git a/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt b/test cases/unit/99 install all targets/subprojects/subproject/bbb.txt index ba629238c..ba629238c 100644 --- a/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt +++ b/test cases/unit/99 install all targets/subprojects/subproject/bbb.txt diff --git a/test cases/unit/98 install all targets/subprojects/subproject/meson.build b/test cases/unit/99 install all targets/subprojects/subproject/meson.build index ff474ace1..ff474ace1 100644 --- a/test cases/unit/98 install all targets/subprojects/subproject/meson.build +++ b/test cases/unit/99 install all targets/subprojects/subproject/meson.build diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index 53a0042c2..86a6b61c9 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -634,7 +634,7 @@ class AllPlatformTests(BasePlatformTests): 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']) @@ -1958,7 +1958,7 @@ class AllPlatformTests(BasePlatformTests): 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) @@ -2369,7 +2369,7 @@ class AllPlatformTests(BasePlatformTests): 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) @@ -4206,7 +4206,7 @@ class AllPlatformTests(BasePlatformTests): self.init(srcdir, extra_args=['-Dbuild.b_lto=true']) def test_install_skip_subprojects(self): - testdir = os.path.join(self.unit_test_dir, '91 install skip subprojects') + testdir = os.path.join(self.unit_test_dir, '92 install skip subprojects') self.init(testdir) self.build() @@ -4253,7 +4253,7 @@ class AllPlatformTests(BasePlatformTests): check_installed_files(['--skip-subprojects', 'another'], all_expected) def test_adding_subproject_to_configure_project(self) -> None: - srcdir = os.path.join(self.unit_test_dir, '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') @@ -4303,7 +4303,7 @@ class AllPlatformTests(BasePlatformTests): 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() @@ -4328,7 +4328,7 @@ class AllPlatformTests(BasePlatformTests): 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() @@ -4368,7 +4368,7 @@ class AllPlatformTests(BasePlatformTests): self.assertEqual(sorted(link_args), sorted(['-flto'])) def test_install_tag(self) -> None: - testdir = os.path.join(self.unit_test_dir, '98 install all targets') + testdir = os.path.join(self.unit_test_dir, '99 install all targets') self.init(testdir) self.build() @@ -4539,7 +4539,7 @@ class AllPlatformTests(BasePlatformTests): 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) @@ -4791,7 +4791,7 @@ class AllPlatformTests(BasePlatformTests): }} ''') - 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', encoding='utf-8') as f: f.write(template.format(0)) @@ -4839,7 +4839,7 @@ class AllPlatformTests(BasePlatformTests): return 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: diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index de86fa7fa..4fcf52e09 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1366,7 +1366,7 @@ class LinuxlikeTests(BasePlatformTests): see: https://github.com/mesonbuild/meson/issues/9000 https://stackoverflow.com/questions/48532868/gcc-library-option-with-a-colon-llibevent-a ''' - testdir = os.path.join(self.unit_test_dir, '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 @@ -1379,7 +1379,7 @@ class LinuxlikeTests(BasePlatformTests): self.new_builddir() env = {'LIBRARY_PATH': os.path.join(installdir, self.libdir), 'PKG_CONFIG_PATH': _prepend_pkg_config_path(os.path.join(installdir, self.libdir, 'pkgconfig'))} - testdir = os.path.join(self.unit_test_dir, '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 @@ -1791,7 +1791,7 @@ class LinuxlikeTests(BasePlatformTests): @skipUnless(is_linux() or is_osx(), 'Test only applicable to Linux and macOS') 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 1f4ea7ea0..31dea0ffe 100644 --- a/unittests/platformagnostictests.py +++ b/unittests/platformagnostictests.py @@ -39,7 +39,7 @@ class PlatformAgnosticTests(BasePlatformTests): Tests that find_program() with a relative path does not find the program in current workdir. ''' - testdir = os.path.join(self.unit_test_dir, '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): @@ -75,11 +75,11 @@ class PlatformAgnosticTests(BasePlatformTests): 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) |
