diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2023-03-28 14:09:58 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2023-03-28 17:18:57 +0300 |
commit | 78d8924d433401a969b6bfaa7b2a4bd613609744 (patch) | |
tree | 8c1f97d5b510f705b2d22b85caa4af9216f2e58d | |
parent | c4cc14c27c7e46f65b410dbdd0f87dd73427b20d (diff) | |
download | meson-78d8924d433401a969b6bfaa7b2a4bd613609744.zip meson-78d8924d433401a969b6bfaa7b2a4bd613609744.tar.gz meson-78d8924d433401a969b6bfaa7b2a4bd613609744.tar.bz2 |
Condense test directories for rc1.
-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/107 subproject symlink/cp.py (renamed from test cases/unit/106 subproject symlink/cp.py) | 0 | ||||
-rw-r--r-- | test cases/unit/107 subproject symlink/main.c (renamed from test cases/unit/106 subproject symlink/main.c) | 0 | ||||
-rw-r--r-- | test cases/unit/107 subproject symlink/meson.build (renamed from test cases/unit/106 subproject symlink/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile (renamed from test cases/unit/106 subproject symlink/symlinked_subproject/datadir/datafile) | 0 | ||||
-rw-r--r-- | test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build (renamed from test cases/unit/106 subproject symlink/symlinked_subproject/datadir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/107 subproject symlink/symlinked_subproject/meson.build (renamed from test cases/unit/106 subproject symlink/symlinked_subproject/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/107 subproject symlink/symlinked_subproject/src.c (renamed from test cases/unit/106 subproject symlink/symlinked_subproject/src.c) | 0 | ||||
-rw-r--r-- | test cases/unit/108 new subproject on reconfigure/meson.build (renamed from test cases/unit/107 new subproject on reconfigure/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/108 new subproject on reconfigure/meson_options.txt (renamed from test cases/unit/107 new subproject on reconfigure/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c (renamed from test cases/unit/107 new subproject on reconfigure/subprojects/foo/foo.c) | 0 | ||||
-rw-r--r-- | test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build (renamed from test cases/unit/107 new subproject on reconfigure/subprojects/foo/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/109 configure same noop/meson.build (renamed from test cases/unit/108 configure same noop/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/109 configure same noop/meson_options.txt (renamed from test cases/unit/108 configure same noop/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/unit/110 freeze/freeze.c (renamed from test cases/unit/109 freeze/freeze.c) | 0 | ||||
-rw-r--r-- | test cases/unit/110 freeze/meson.build (renamed from test cases/unit/109 freeze/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/111 classpath/com/mesonbuild/Simple.java (renamed from test cases/unit/110 classpath/com/mesonbuild/Simple.java) | 0 | ||||
-rw-r--r-- | test cases/unit/111 classpath/meson.build (renamed from test cases/unit/110 classpath/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/112 list build options/meson.build (renamed from test cases/unit/110 list build options/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/112 list build options/meson_options.txt (renamed from test cases/unit/110 list build options/meson_options.txt) | 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-- | unittests/allplatformstests.py | 28 | ||||
-rw-r--r-- | unittests/linuxliketests.py | 8 | ||||
-rw-r--r-- | unittests/machinefiletests.py | 2 | ||||
-rw-r--r-- | unittests/platformagnostictests.py | 8 |
93 files changed, 23 insertions, 23 deletions
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 e69de29..e69de29 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 8287614..8287614 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 785a7b3..785a7b3 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 21239b7..21239b7 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 5745d8a..5745d8a 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 475f5f5..475f5f5 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 3487bc5..3487bc5 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 d0f82e4..d0f82e4 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 2d15b2a..2d15b2a 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 014a617..014a617 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 7d8163c..7d8163c 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 dff61ab..dff61ab 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 c3f4c76..c3f4c76 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 ff21286..ff21286 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/106 subproject symlink/cp.py b/test cases/unit/107 subproject symlink/cp.py index adb0547..adb0547 100644 --- a/test cases/unit/106 subproject symlink/cp.py +++ b/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 index 62bd4b4..62bd4b4 100644 --- a/test cases/unit/106 subproject symlink/main.c +++ b/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 index 6766c8e..6766c8e 100644 --- a/test cases/unit/106 subproject symlink/meson.build +++ b/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 index 6a68294..6a68294 100644 --- a/test cases/unit/106 subproject symlink/symlinked_subproject/datadir/datafile +++ b/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 index cbeb0a9..cbeb0a9 100644 --- a/test cases/unit/106 subproject symlink/symlinked_subproject/datadir/meson.build +++ b/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 index 3930465..3930465 100644 --- a/test cases/unit/106 subproject symlink/symlinked_subproject/meson.build +++ b/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 index 97d7ad1..97d7ad1 100644 --- a/test cases/unit/106 subproject symlink/symlinked_subproject/src.c +++ b/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 index 7342c9a..7342c9a 100644 --- a/test cases/unit/107 new subproject on reconfigure/meson.build +++ b/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 index b3dd683..b3dd683 100644 --- a/test cases/unit/107 new subproject on reconfigure/meson_options.txt +++ b/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 index 1edf995..1edf995 100644 --- 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 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 index 2a6e30a..2a6e30a 100644 --- 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 diff --git a/test cases/unit/108 configure same noop/meson.build b/test cases/unit/109 configure same noop/meson.build index d3f1326..d3f1326 100644 --- a/test cases/unit/108 configure same noop/meson.build +++ b/test cases/unit/109 configure same noop/meson.build diff --git a/test cases/unit/108 configure same noop/meson_options.txt b/test cases/unit/109 configure same noop/meson_options.txt index 57b4084..57b4084 100644 --- a/test cases/unit/108 configure same noop/meson_options.txt +++ b/test cases/unit/109 configure same noop/meson_options.txt diff --git a/test cases/unit/109 freeze/freeze.c b/test cases/unit/110 freeze/freeze.c index 0a45c1a..0a45c1a 100644 --- a/test cases/unit/109 freeze/freeze.c +++ b/test cases/unit/110 freeze/freeze.c diff --git a/test cases/unit/109 freeze/meson.build b/test cases/unit/110 freeze/meson.build index 1a84f37..1a84f37 100644 --- a/test cases/unit/109 freeze/meson.build +++ b/test cases/unit/110 freeze/meson.build diff --git a/test cases/unit/110 classpath/com/mesonbuild/Simple.java b/test cases/unit/111 classpath/com/mesonbuild/Simple.java index 325a49a..325a49a 100644 --- a/test cases/unit/110 classpath/com/mesonbuild/Simple.java +++ b/test cases/unit/111 classpath/com/mesonbuild/Simple.java diff --git a/test cases/unit/110 classpath/meson.build b/test cases/unit/111 classpath/meson.build index e6b9b84..e6b9b84 100644 --- a/test cases/unit/110 classpath/meson.build +++ b/test cases/unit/111 classpath/meson.build diff --git a/test cases/unit/110 list build options/meson.build b/test cases/unit/112 list build options/meson.build index 2d634d3..2d634d3 100644 --- a/test cases/unit/110 list build options/meson.build +++ b/test cases/unit/112 list build options/meson.build diff --git a/test cases/unit/110 list build options/meson_options.txt b/test cases/unit/112 list build options/meson_options.txt index d84f22a..d84f22a 100644 --- a/test cases/unit/110 list build options/meson_options.txt +++ b/test cases/unit/112 list build options/meson_options.txt diff --git a/test cases/unit/91 install skip subprojects/foo.c b/test cases/unit/92 install skip subprojects/foo.c index 25927f5..25927f5 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 421376d..421376d 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 a7e26ac..a7e26ac 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 e69de29..e69de29 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 cfbae94..cfbae94 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 25927f5..25927f5 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 421376d..421376d 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 a7e26ac..a7e26ac 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 421376d..421376d 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 b5b0734..b5b0734 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 b82aa41..b82aa41 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 12d8395..12d8395 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 9713d9f..9713d9f 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 a833b0c..a833b0c 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 689bc60..689bc60 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 7fc4d5a..7fc4d5a 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 f057c00..f057c00 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 8f4af98..8f4af98 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 99a0ea6..99a0ea6 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 f1d18b7..f1d18b7 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 99a0ea6..99a0ea6 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 48e033a..48e033a 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 e749753..e749753 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 3237441..3237441 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 bab1139..bab1139 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 db9df9d..db9df9d 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 e64b229..e64b229 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 623a338..623a338 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 89a4727..89a4727 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 c409dcb..c409dcb 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 78f2de1..78f2de1 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 8129601..8129601 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 128c213..128c213 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 5e79966..5e79966 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 5be5bc9..5be5bc9 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 65e9d8e..65e9d8e 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 e69de29..e69de29 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 e69de29..e69de29 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 e69de29..e69de29 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 557db03..557db03 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 59b0644..59b0644 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 3b94f91..3b94f91 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 8437692..8437692 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 e69de29..e69de29 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 e69de29..e69de29 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 2ea9c7d..2ea9c7d 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 0fb4389..0fb4389 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 75b4590..75b4590 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 c5f3be9..c5f3be9 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 e69de29..e69de29 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 e69de29..e69de29 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 e69de29..e69de29 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 2ea9c7d..2ea9c7d 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 0fb4389..0fb4389 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 53c796a..53c796a 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 c5f3be9..c5f3be9 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/unittests/allplatformstests.py b/unittests/allplatformstests.py index c05cb33..b9c3fe0 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -543,7 +543,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']) @@ -1839,7 +1839,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) @@ -1993,7 +1993,7 @@ class AllPlatformTests(BasePlatformTests): def test_options_listed_in_build_options(self) -> None: """Detect when changed options become listed in build options.""" - testdir = os.path.join(self.unit_test_dir, '110 list build options') + testdir = os.path.join(self.unit_test_dir, '112 list build options') out = self.init(testdir) for line in out.splitlines(): @@ -2229,7 +2229,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) @@ -4002,7 +4002,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() @@ -4048,7 +4048,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') @@ -4098,7 +4098,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() @@ -4123,7 +4123,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() @@ -4163,7 +4163,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() @@ -4331,7 +4331,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) @@ -4542,7 +4542,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') as f: f.write(template.format(0)) @@ -4562,7 +4562,7 @@ class AllPlatformTests(BasePlatformTests): self.assertIn('exit status 39', cm.exception.stdout) def test_custom_target_name(self): - testdir = os.path.join(self.unit_test_dir, '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: @@ -4570,7 +4570,7 @@ class AllPlatformTests(BasePlatformTests): self.assertIn('Generating subdir/file.txt with a custom command', out) def test_symlinked_subproject(self): - testdir = os.path.join(self.unit_test_dir, '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') @@ -4583,7 +4583,7 @@ class AllPlatformTests(BasePlatformTests): self.build() def test_configure_same_noop(self): - testdir = os.path.join(self.unit_test_dir, '108 configure same noop') + testdir = os.path.join(self.unit_test_dir, '109 configure same noop') args = [ '-Dstring=val', '-Dboolean=true', diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 50c6b62..c94169a 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1350,7 +1350,7 @@ class LinuxlikeTests(BasePlatformTests): see: https://github.com/mesonbuild/meson/issues/9000 https://stackoverflow.com/questions/48532868/gcc-library-option-with-a-colon-llibevent-a ''' - testdir = os.path.join(self.unit_test_dir, '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 @@ -1363,7 +1363,7 @@ class LinuxlikeTests(BasePlatformTests): self.new_builddir() env = {'LIBRARY_PATH': os.path.join(installdir, self.libdir), 'PKG_CONFIG_PATH': _prepend_pkg_config_path(os.path.join(installdir, self.libdir, 'pkgconfig'))} - testdir = os.path.join(self.unit_test_dir, '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 @@ -1775,7 +1775,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() @@ -1822,7 +1822,7 @@ class LinuxlikeTests(BasePlatformTests): self.assertFalse(cpp.compiler_args([f'-isystem{symlink}' for symlink in default_symlinks]).to_native()) def test_freezing(self): - testdir = os.path.join(self.unit_test_dir, '109 freeze') + testdir = os.path.join(self.unit_test_dir, '110 freeze') self.init(testdir) self.build() with self.assertRaises(subprocess.CalledProcessError) as e: diff --git a/unittests/machinefiletests.py b/unittests/machinefiletests.py index bf109b2..d2c3c0a 100644 --- a/unittests/machinefiletests.py +++ b/unittests/machinefiletests.py @@ -373,7 +373,7 @@ class NativeFileTests(BasePlatformTests): def test_java_classpath(self): if self.backend is not Backend.ninja: raise SkipTest('Jar is only supported with Ninja') - testdir = os.path.join(self.unit_test_dir, '110 classpath') + testdir = os.path.join(self.unit_test_dir, '111 classpath') self.init(testdir) self.build() one_build_path = get_classpath(os.path.join(self.builddir, 'one.jar')) diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py index 18540b5..9fb24f3 100644 --- a/unittests/platformagnostictests.py +++ b/unittests/platformagnostictests.py @@ -37,7 +37,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): @@ -73,11 +73,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) @@ -89,7 +89,7 @@ class PlatformAgnosticTests(BasePlatformTests): self.assertIn(log_msg, mesonlog) 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() |