Condense test directory names.
diff --git a/run_format_tests.py b/run_format_tests.py index dee787b..30c9758 100755 --- a/run_format_tests.py +++ b/run_format_tests.py
@@ -51,7 +51,7 @@ 'work area', '.eggs', '_cache', # e.g. .mypy_cache 'venv', # virtualenvs have DOS line endings - '121 rewrite', # we explicitly test for tab in meson.build file + '120 rewrite', # we explicitly test for tab in meson.build file '3 editorconfig', } for (root, _, filenames) in os.walk('.'):
diff --git a/test cases/common/282 wrap override/meson.build b/test cases/common/283 wrap override/meson.build similarity index 100% rename from test cases/common/282 wrap override/meson.build rename to test cases/common/283 wrap override/meson.build
diff --git a/test cases/common/282 wrap override/subprojects/sub/meson.build b/test cases/common/283 wrap override/subprojects/sub/meson.build similarity index 100% rename from test cases/common/282 wrap override/subprojects/sub/meson.build rename to test cases/common/283 wrap override/subprojects/sub/meson.build
diff --git a/test cases/common/282 wrap override/subprojects/sub/subprojects/subsub.wrap b/test cases/common/283 wrap override/subprojects/sub/subprojects/subsub.wrap similarity index 100% rename from test cases/common/282 wrap override/subprojects/sub/subprojects/subsub.wrap rename to test cases/common/283 wrap override/subprojects/sub/subprojects/subsub.wrap
diff --git a/test cases/common/282 wrap override/subprojects/subsub/meson.build b/test cases/common/283 wrap override/subprojects/subsub/meson.build similarity index 100% rename from test cases/common/282 wrap override/subprojects/subsub/meson.build rename to test cases/common/283 wrap override/subprojects/subsub/meson.build
diff --git a/test cases/common/283 pkgconfig subproject/meson.build b/test cases/common/284 pkgconfig subproject/meson.build similarity index 100% rename from test cases/common/283 pkgconfig subproject/meson.build rename to test cases/common/284 pkgconfig subproject/meson.build
diff --git a/test cases/common/283 pkgconfig subproject/simple.c b/test cases/common/284 pkgconfig subproject/simple.c similarity index 100% rename from test cases/common/283 pkgconfig subproject/simple.c rename to test cases/common/284 pkgconfig subproject/simple.c
diff --git a/test cases/common/283 pkgconfig subproject/simple.h b/test cases/common/284 pkgconfig subproject/simple.h similarity index 100% rename from test cases/common/283 pkgconfig subproject/simple.h rename to test cases/common/284 pkgconfig subproject/simple.h
diff --git a/test cases/common/283 pkgconfig subproject/subprojects/simple2/exports.def b/test cases/common/284 pkgconfig subproject/subprojects/simple2/exports.def similarity index 100% rename from test cases/common/283 pkgconfig subproject/subprojects/simple2/exports.def rename to test cases/common/284 pkgconfig subproject/subprojects/simple2/exports.def
diff --git a/test cases/common/283 pkgconfig subproject/subprojects/simple2/meson.build b/test cases/common/284 pkgconfig subproject/subprojects/simple2/meson.build similarity index 100% rename from test cases/common/283 pkgconfig subproject/subprojects/simple2/meson.build rename to test cases/common/284 pkgconfig subproject/subprojects/simple2/meson.build
diff --git a/test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.c b/test cases/common/284 pkgconfig subproject/subprojects/simple2/simple2.c similarity index 100% rename from test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.c rename to test cases/common/284 pkgconfig subproject/subprojects/simple2/simple2.c
diff --git a/test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.h b/test cases/common/284 pkgconfig subproject/subprojects/simple2/simple2.h similarity index 100% rename from test cases/common/283 pkgconfig subproject/subprojects/simple2/simple2.h rename to test cases/common/284 pkgconfig subproject/subprojects/simple2/simple2.h
diff --git a/test cases/common/283 pkgconfig subproject/test.json b/test cases/common/284 pkgconfig subproject/test.json similarity index 100% rename from test cases/common/283 pkgconfig subproject/test.json rename to test cases/common/284 pkgconfig subproject/test.json
diff --git a/test cases/unit/101 relative find program/foo.py b/test cases/unit/100 relative find program/foo.py similarity index 100% rename from test cases/unit/101 relative find program/foo.py rename to test cases/unit/100 relative find program/foo.py
diff --git a/test cases/unit/101 relative find program/meson.build b/test cases/unit/100 relative find program/meson.build similarity index 100% rename from test cases/unit/101 relative find program/meson.build rename to test cases/unit/100 relative find program/meson.build
diff --git a/test cases/unit/101 relative find program/subdir/meson.build b/test cases/unit/100 relative find program/subdir/meson.build similarity index 100% rename from test cases/unit/101 relative find program/subdir/meson.build rename to test cases/unit/100 relative find program/subdir/meson.build
diff --git a/test cases/unit/102 rlib linkage/lib2.rs b/test cases/unit/101 rlib linkage/lib2.rs similarity index 100% rename from test cases/unit/102 rlib linkage/lib2.rs rename to test cases/unit/101 rlib linkage/lib2.rs
diff --git a/test cases/unit/102 rlib linkage/main.rs b/test cases/unit/101 rlib linkage/main.rs similarity index 100% rename from test cases/unit/102 rlib linkage/main.rs rename to test cases/unit/101 rlib linkage/main.rs
diff --git a/test cases/unit/102 rlib linkage/meson.build b/test cases/unit/101 rlib linkage/meson.build similarity index 100% rename from test cases/unit/102 rlib linkage/meson.build rename to test cases/unit/101 rlib linkage/meson.build
diff --git a/test cases/unit/103 python without pkgconfig/meson.build b/test cases/unit/102 python without pkgconfig/meson.build similarity index 100% rename from test cases/unit/103 python without pkgconfig/meson.build rename to test cases/unit/102 python without pkgconfig/meson.build
diff --git a/test cases/unit/104 strip/lib.c b/test cases/unit/103 strip/lib.c similarity index 100% rename from test cases/unit/104 strip/lib.c rename to test cases/unit/103 strip/lib.c
diff --git a/test cases/unit/104 strip/meson.build b/test cases/unit/103 strip/meson.build similarity index 100% rename from test cases/unit/104 strip/meson.build rename to test cases/unit/103 strip/meson.build
diff --git a/test cases/unit/105 debug function/meson.build b/test cases/unit/104 debug function/meson.build similarity index 100% rename from test cases/unit/105 debug function/meson.build rename to test cases/unit/104 debug function/meson.build
diff --git a/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build b/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build similarity index 100% rename from test cases/unit/106 pkgconfig relocatable with absolute path/meson.build rename to test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
diff --git a/test cases/unit/107 underspecified mtest/main.c b/test cases/unit/106 underspecified mtest/main.c similarity index 100% rename from test cases/unit/107 underspecified mtest/main.c rename to test cases/unit/106 underspecified mtest/main.c
diff --git a/test cases/unit/107 underspecified mtest/meson.build b/test cases/unit/106 underspecified mtest/meson.build similarity index 100% rename from test cases/unit/107 underspecified mtest/meson.build rename to test cases/unit/106 underspecified mtest/meson.build
diff --git a/test cases/unit/107 underspecified mtest/runner.py b/test cases/unit/106 underspecified mtest/runner.py similarity index 100% rename from test cases/unit/107 underspecified mtest/runner.py rename to test cases/unit/106 underspecified mtest/runner.py
diff --git a/test cases/unit/108 subproject symlink/cp.py b/test cases/unit/107 subproject symlink/cp.py similarity index 100% rename from test cases/unit/108 subproject symlink/cp.py rename to test cases/unit/107 subproject symlink/cp.py
diff --git a/test cases/unit/108 subproject symlink/main.c b/test cases/unit/107 subproject symlink/main.c similarity index 100% rename from test cases/unit/108 subproject symlink/main.c rename to test cases/unit/107 subproject symlink/main.c
diff --git a/test cases/unit/108 subproject symlink/meson.build b/test cases/unit/107 subproject symlink/meson.build similarity index 100% rename from test cases/unit/108 subproject symlink/meson.build rename to test cases/unit/107 subproject symlink/meson.build
diff --git a/test cases/unit/108 subproject symlink/symlinked_subproject/datadir/datafile b/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile similarity index 100% rename from test cases/unit/108 subproject symlink/symlinked_subproject/datadir/datafile rename to test cases/unit/107 subproject symlink/symlinked_subproject/datadir/datafile
diff --git a/test cases/unit/108 subproject symlink/symlinked_subproject/datadir/meson.build b/test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build similarity index 100% rename from test cases/unit/108 subproject symlink/symlinked_subproject/datadir/meson.build rename to test cases/unit/107 subproject symlink/symlinked_subproject/datadir/meson.build
diff --git a/test cases/unit/108 subproject symlink/symlinked_subproject/meson.build b/test cases/unit/107 subproject symlink/symlinked_subproject/meson.build similarity index 100% rename from test cases/unit/108 subproject symlink/symlinked_subproject/meson.build rename to test cases/unit/107 subproject symlink/symlinked_subproject/meson.build
diff --git a/test cases/unit/108 subproject symlink/symlinked_subproject/src.c b/test cases/unit/107 subproject symlink/symlinked_subproject/src.c similarity index 100% rename from test cases/unit/108 subproject symlink/symlinked_subproject/src.c rename to test cases/unit/107 subproject symlink/symlinked_subproject/src.c
diff --git a/test cases/unit/109 new subproject on reconfigure/meson.build b/test cases/unit/108 new subproject on reconfigure/meson.build similarity index 100% rename from test cases/unit/109 new subproject on reconfigure/meson.build rename to test cases/unit/108 new subproject on reconfigure/meson.build
diff --git a/test cases/unit/109 new subproject on reconfigure/meson_options.txt b/test cases/unit/108 new subproject on reconfigure/meson_options.txt similarity index 100% rename from test cases/unit/109 new subproject on reconfigure/meson_options.txt rename to test cases/unit/108 new subproject on reconfigure/meson_options.txt
diff --git a/test cases/unit/109 new subproject on reconfigure/subprojects/foo/foo.c b/test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c similarity index 100% rename from test cases/unit/109 new subproject on reconfigure/subprojects/foo/foo.c rename to test cases/unit/108 new subproject on reconfigure/subprojects/foo/foo.c
diff --git a/test cases/unit/109 new subproject on reconfigure/subprojects/foo/meson.build b/test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build similarity index 100% rename from test cases/unit/109 new subproject on reconfigure/subprojects/foo/meson.build rename to test cases/unit/108 new subproject on reconfigure/subprojects/foo/meson.build
diff --git a/test cases/unit/110 configure same noop/meson.build b/test cases/unit/109 configure same noop/meson.build similarity index 100% rename from test cases/unit/110 configure same noop/meson.build rename to test cases/unit/109 configure same noop/meson.build
diff --git a/test cases/unit/110 configure same noop/meson_options.txt b/test cases/unit/109 configure same noop/meson_options.txt similarity index 100% rename from test cases/unit/110 configure same noop/meson_options.txt rename to test cases/unit/109 configure same noop/meson_options.txt
diff --git a/test cases/unit/111 freeze/freeze.c b/test cases/unit/110 freeze/freeze.c similarity index 100% rename from test cases/unit/111 freeze/freeze.c rename to test cases/unit/110 freeze/freeze.c
diff --git a/test cases/unit/111 freeze/meson.build b/test cases/unit/110 freeze/meson.build similarity index 100% rename from test cases/unit/111 freeze/meson.build rename to test cases/unit/110 freeze/meson.build
diff --git a/test cases/unit/112 replace unencodable xml chars/meson.build b/test cases/unit/111 replace unencodable xml chars/meson.build similarity index 100% rename from test cases/unit/112 replace unencodable xml chars/meson.build rename to test cases/unit/111 replace unencodable xml chars/meson.build
diff --git a/test cases/unit/112 replace unencodable xml chars/script.py b/test cases/unit/111 replace unencodable xml chars/script.py similarity index 100% rename from test cases/unit/112 replace unencodable xml chars/script.py rename to test cases/unit/111 replace unencodable xml chars/script.py
diff --git a/test cases/unit/113 classpath/com/mesonbuild/Simple.java b/test cases/unit/112 classpath/com/mesonbuild/Simple.java similarity index 100% rename from test cases/unit/113 classpath/com/mesonbuild/Simple.java rename to test cases/unit/112 classpath/com/mesonbuild/Simple.java
diff --git a/test cases/unit/113 classpath/meson.build b/test cases/unit/112 classpath/meson.build similarity index 100% rename from test cases/unit/113 classpath/meson.build rename to test cases/unit/112 classpath/meson.build
diff --git a/test cases/unit/114 list build options/meson.build b/test cases/unit/113 list build options/meson.build similarity index 100% rename from test cases/unit/114 list build options/meson.build rename to test cases/unit/113 list build options/meson.build
diff --git a/test cases/unit/114 list build options/meson_options.txt b/test cases/unit/113 list build options/meson_options.txt similarity index 100% rename from test cases/unit/114 list build options/meson_options.txt rename to test cases/unit/113 list build options/meson_options.txt
diff --git a/test cases/unit/115 complex link cases/main.c b/test cases/unit/114 complex link cases/main.c similarity index 100% rename from test cases/unit/115 complex link cases/main.c rename to test cases/unit/114 complex link cases/main.c
diff --git a/test cases/unit/115 complex link cases/meson.build b/test cases/unit/114 complex link cases/meson.build similarity index 100% rename from test cases/unit/115 complex link cases/meson.build rename to test cases/unit/114 complex link cases/meson.build
diff --git a/test cases/unit/115 complex link cases/s1.c b/test cases/unit/114 complex link cases/s1.c similarity index 100% rename from test cases/unit/115 complex link cases/s1.c rename to test cases/unit/114 complex link cases/s1.c
diff --git a/test cases/unit/115 complex link cases/s2.c b/test cases/unit/114 complex link cases/s2.c similarity index 100% rename from test cases/unit/115 complex link cases/s2.c rename to test cases/unit/114 complex link cases/s2.c
diff --git a/test cases/unit/115 complex link cases/s3.c b/test cases/unit/114 complex link cases/s3.c similarity index 100% rename from test cases/unit/115 complex link cases/s3.c rename to test cases/unit/114 complex link cases/s3.c
diff --git a/test cases/unit/116 c cpp stds/meson.build b/test cases/unit/115 c cpp stds/meson.build similarity index 100% rename from test cases/unit/116 c cpp stds/meson.build rename to test cases/unit/115 c cpp stds/meson.build
diff --git a/test cases/unit/116 c cpp stds/meson.options b/test cases/unit/115 c cpp stds/meson.options similarity index 100% rename from test cases/unit/116 c cpp stds/meson.options rename to test cases/unit/115 c cpp stds/meson.options
diff --git a/test cases/unit/117 empty project/expected_mods.json b/test cases/unit/116 empty project/expected_mods.json similarity index 100% rename from test cases/unit/117 empty project/expected_mods.json rename to test cases/unit/116 empty project/expected_mods.json
diff --git a/test cases/unit/117 empty project/meson.build b/test cases/unit/116 empty project/meson.build similarity index 100% rename from test cases/unit/117 empty project/meson.build rename to test cases/unit/116 empty project/meson.build
diff --git a/test cases/unit/118 genvslite/main.cpp b/test cases/unit/117 genvslite/main.cpp similarity index 100% rename from test cases/unit/118 genvslite/main.cpp rename to test cases/unit/117 genvslite/main.cpp
diff --git a/test cases/unit/118 genvslite/meson.build b/test cases/unit/117 genvslite/meson.build similarity index 100% rename from test cases/unit/118 genvslite/meson.build rename to test cases/unit/117 genvslite/meson.build
diff --git a/test cases/unit/119 meson package cache dir/cache_dir/bar/meson.build b/test cases/unit/118 meson package cache dir/cache_dir/bar/meson.build similarity index 100% rename from test cases/unit/119 meson package cache dir/cache_dir/bar/meson.build rename to test cases/unit/118 meson package cache dir/cache_dir/bar/meson.build
diff --git a/test cases/unit/119 meson package cache dir/cache_dir/foo.zip b/test cases/unit/118 meson package cache dir/cache_dir/foo.zip similarity index 100% rename from test cases/unit/119 meson package cache dir/cache_dir/foo.zip rename to test cases/unit/118 meson package cache dir/cache_dir/foo.zip Binary files differ
diff --git a/test cases/unit/119 meson package cache dir/meson.build b/test cases/unit/118 meson package cache dir/meson.build similarity index 100% rename from test cases/unit/119 meson package cache dir/meson.build rename to test cases/unit/118 meson package cache dir/meson.build
diff --git a/test cases/unit/119 meson package cache dir/subprojects/bar.wrap b/test cases/unit/118 meson package cache dir/subprojects/bar.wrap similarity index 100% rename from test cases/unit/119 meson package cache dir/subprojects/bar.wrap rename to test cases/unit/118 meson package cache dir/subprojects/bar.wrap
diff --git a/test cases/unit/119 meson package cache dir/subprojects/foo.wrap b/test cases/unit/118 meson package cache dir/subprojects/foo.wrap similarity index 100% rename from test cases/unit/119 meson package cache dir/subprojects/foo.wrap rename to test cases/unit/118 meson package cache dir/subprojects/foo.wrap
diff --git a/test cases/unit/120 openssl cmake bug/meson.build b/test cases/unit/119 openssl cmake bug/meson.build similarity index 100% rename from test cases/unit/120 openssl cmake bug/meson.build rename to test cases/unit/119 openssl cmake bug/meson.build
diff --git a/test cases/unit/120 openssl cmake bug/nativefile.ini b/test cases/unit/119 openssl cmake bug/nativefile.ini similarity index 100% rename from test cases/unit/120 openssl cmake bug/nativefile.ini rename to test cases/unit/119 openssl cmake bug/nativefile.ini
diff --git a/test cases/unit/121 rewrite/meson.build b/test cases/unit/120 rewrite/meson.build similarity index 100% rename from test cases/unit/121 rewrite/meson.build rename to test cases/unit/120 rewrite/meson.build
diff --git a/test cases/unit/122 executable suffix/main.c b/test cases/unit/121 executable suffix/main.c similarity index 100% rename from test cases/unit/122 executable suffix/main.c rename to test cases/unit/121 executable suffix/main.c
diff --git a/test cases/unit/122 executable suffix/meson.build b/test cases/unit/121 executable suffix/meson.build similarity index 100% rename from test cases/unit/122 executable suffix/meson.build rename to test cases/unit/121 executable suffix/meson.build
diff --git a/test cases/unit/123 persp options/meson.build b/test cases/unit/122 persp options/meson.build similarity index 100% rename from test cases/unit/123 persp options/meson.build rename to test cases/unit/122 persp options/meson.build
diff --git a/test cases/unit/123 persp options/meson.options b/test cases/unit/122 persp options/meson.options similarity index 100% rename from test cases/unit/123 persp options/meson.options rename to test cases/unit/122 persp options/meson.options
diff --git a/test cases/unit/123 persp options/subprojects/sub1/meson.build b/test cases/unit/122 persp options/subprojects/sub1/meson.build similarity index 100% rename from test cases/unit/123 persp options/subprojects/sub1/meson.build rename to test cases/unit/122 persp options/subprojects/sub1/meson.build
diff --git a/test cases/unit/123 persp options/subprojects/sub1/meson.options b/test cases/unit/122 persp options/subprojects/sub1/meson.options similarity index 100% rename from test cases/unit/123 persp options/subprojects/sub1/meson.options rename to test cases/unit/122 persp options/subprojects/sub1/meson.options
diff --git a/test cases/unit/123 persp options/subprojects/sub1/sub1.c b/test cases/unit/122 persp options/subprojects/sub1/sub1.c similarity index 100% rename from test cases/unit/123 persp options/subprojects/sub1/sub1.c rename to test cases/unit/122 persp options/subprojects/sub1/sub1.c
diff --git a/test cases/unit/123 persp options/subprojects/sub2/meson.build b/test cases/unit/122 persp options/subprojects/sub2/meson.build similarity index 100% rename from test cases/unit/123 persp options/subprojects/sub2/meson.build rename to test cases/unit/122 persp options/subprojects/sub2/meson.build
diff --git a/test cases/unit/123 persp options/subprojects/sub2/meson.options b/test cases/unit/122 persp options/subprojects/sub2/meson.options similarity index 100% rename from test cases/unit/123 persp options/subprojects/sub2/meson.options rename to test cases/unit/122 persp options/subprojects/sub2/meson.options
diff --git a/test cases/unit/123 persp options/subprojects/sub2/sub2.c b/test cases/unit/122 persp options/subprojects/sub2/sub2.c similarity index 100% rename from test cases/unit/123 persp options/subprojects/sub2/sub2.c rename to test cases/unit/122 persp options/subprojects/sub2/sub2.c
diff --git a/test cases/unit/123 persp options/toplevel.c b/test cases/unit/122 persp options/toplevel.c similarity index 100% rename from test cases/unit/123 persp options/toplevel.c rename to test cases/unit/122 persp options/toplevel.c
diff --git a/test cases/unit/124 reconfigure base options/meson.build b/test cases/unit/123 reconfigure base options/meson.build similarity index 100% rename from test cases/unit/124 reconfigure base options/meson.build rename to test cases/unit/123 reconfigure base options/meson.build
diff --git a/test cases/unit/124 reconfigure base options/subprojects/sub/meson.build b/test cases/unit/123 reconfigure base options/subprojects/sub/meson.build similarity index 100% rename from test cases/unit/124 reconfigure base options/subprojects/sub/meson.build rename to test cases/unit/123 reconfigure base options/subprojects/sub/meson.build
diff --git a/test cases/unit/125 interactive tap/meson.build b/test cases/unit/124 interactive tap/meson.build similarity index 100% rename from test cases/unit/125 interactive tap/meson.build rename to test cases/unit/124 interactive tap/meson.build
diff --git a/test cases/unit/125 interactive tap/script.py b/test cases/unit/124 interactive tap/script.py similarity index 100% rename from test cases/unit/125 interactive tap/script.py rename to test cases/unit/124 interactive tap/script.py
diff --git a/test cases/unit/126 declare_dep var/meson.build b/test cases/unit/125 declare_dep var/meson.build similarity index 100% rename from test cases/unit/126 declare_dep var/meson.build rename to test cases/unit/125 declare_dep var/meson.build
diff --git a/test cases/unit/126 declare_dep var/meson_options.txt b/test cases/unit/125 declare_dep var/meson_options.txt similarity index 100% rename from test cases/unit/126 declare_dep var/meson_options.txt rename to test cases/unit/125 declare_dep var/meson_options.txt
diff --git a/test cases/unit/127 pkgsubproj/meson.build b/test cases/unit/126 pkgsubproj/meson.build similarity index 100% rename from test cases/unit/127 pkgsubproj/meson.build rename to test cases/unit/126 pkgsubproj/meson.build
diff --git a/test cases/unit/127 pkgsubproj/subprojects/sub/meson.build b/test cases/unit/126 pkgsubproj/subprojects/sub/meson.build similarity index 100% rename from test cases/unit/127 pkgsubproj/subprojects/sub/meson.build rename to test cases/unit/126 pkgsubproj/subprojects/sub/meson.build
diff --git a/test cases/unit/128 test slice/meson.build b/test cases/unit/127 test slice/meson.build similarity index 100% rename from test cases/unit/128 test slice/meson.build rename to test cases/unit/127 test slice/meson.build
diff --git a/test cases/unit/128 test slice/test.py b/test cases/unit/127 test slice/test.py similarity index 100% rename from test cases/unit/128 test slice/test.py rename to test cases/unit/127 test slice/test.py
diff --git a/test cases/unit/129 sanitizers/meson.build b/test cases/unit/128 sanitizers/meson.build similarity index 100% rename from test cases/unit/129 sanitizers/meson.build rename to test cases/unit/128 sanitizers/meson.build
diff --git a/test cases/unit/130 long opt vs D/meson.build b/test cases/unit/129 long opt vs D/meson.build similarity index 100% rename from test cases/unit/130 long opt vs D/meson.build rename to test cases/unit/129 long opt vs D/meson.build
diff --git a/test cases/unit/130 long opt vs D/meson_options.txt b/test cases/unit/129 long opt vs D/meson_options.txt similarity index 100% rename from test cases/unit/130 long opt vs D/meson_options.txt rename to test cases/unit/129 long opt vs D/meson_options.txt
diff --git a/test cases/unit/131 vala internal glib/lib.vala b/test cases/unit/130 vala internal glib/lib.vala similarity index 100% rename from test cases/unit/131 vala internal glib/lib.vala rename to test cases/unit/130 vala internal glib/lib.vala
diff --git a/test cases/unit/131 vala internal glib/meson.build b/test cases/unit/130 vala internal glib/meson.build similarity index 100% rename from test cases/unit/131 vala internal glib/meson.build rename to test cases/unit/130 vala internal glib/meson.build
diff --git a/test cases/unit/131 vala internal glib/meson.options b/test cases/unit/130 vala internal glib/meson.options similarity index 100% rename from test cases/unit/131 vala internal glib/meson.options rename to test cases/unit/130 vala internal glib/meson.options
diff --git a/test cases/unit/92 install skip subprojects/foo.c b/test cases/unit/91 install skip subprojects/foo.c similarity index 100% rename from test cases/unit/92 install skip subprojects/foo.c rename to test cases/unit/91 install skip subprojects/foo.c
diff --git a/test cases/unit/92 install skip subprojects/foo.dat b/test cases/unit/91 install skip subprojects/foo.dat similarity index 100% rename from test cases/unit/92 install skip subprojects/foo.dat rename to test cases/unit/91 install skip subprojects/foo.dat
diff --git a/test cases/unit/92 install skip subprojects/foo.h b/test cases/unit/91 install skip subprojects/foo.h similarity index 100% rename from test cases/unit/92 install skip subprojects/foo.h rename to test cases/unit/91 install skip subprojects/foo.h
diff --git a/test cases/unit/92 install skip subprojects/foo/foofile b/test cases/unit/91 install skip subprojects/foo/foofile similarity index 100% rename from test cases/unit/92 install skip subprojects/foo/foofile rename to test cases/unit/91 install skip subprojects/foo/foofile
diff --git a/test cases/unit/92 install skip subprojects/meson.build b/test cases/unit/91 install skip subprojects/meson.build similarity index 100% rename from test cases/unit/92 install skip subprojects/meson.build rename to test cases/unit/91 install skip subprojects/meson.build
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.c b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.c similarity index 100% rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.c rename to test cases/unit/91 install skip subprojects/subprojects/bar/bar.c
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat similarity index 100% rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.dat rename to test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar.h b/test cases/unit/91 install skip subprojects/subprojects/bar/bar.h similarity index 100% rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar.h rename to test cases/unit/91 install skip subprojects/subprojects/bar/bar.h
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile b/test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile similarity index 100% rename from test cases/unit/92 install skip subprojects/subprojects/bar/bar/barfile rename to test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile
diff --git a/test cases/unit/92 install skip subprojects/subprojects/bar/meson.build b/test cases/unit/91 install skip subprojects/subprojects/bar/meson.build similarity index 100% rename from test cases/unit/92 install skip subprojects/subprojects/bar/meson.build rename to test cases/unit/91 install skip subprojects/subprojects/bar/meson.build
diff --git a/test cases/unit/93 new subproject in configured project/meson.build b/test cases/unit/92 new subproject in configured project/meson.build similarity index 100% rename from test cases/unit/93 new subproject in configured project/meson.build rename to test cases/unit/92 new subproject in configured project/meson.build
diff --git a/test cases/unit/93 new subproject in configured project/meson_options.txt b/test cases/unit/92 new subproject in configured project/meson_options.txt similarity index 100% rename from test cases/unit/93 new subproject in configured project/meson_options.txt rename to test cases/unit/92 new subproject in configured project/meson_options.txt
diff --git a/test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c b/test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c similarity index 100% rename from test cases/unit/93 new subproject in configured project/subprojects/sub/foo.c rename to test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c
diff --git a/test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build b/test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build similarity index 100% rename from test cases/unit/93 new subproject in configured project/subprojects/sub/meson.build rename to test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build
diff --git a/test cases/unit/94 clangformat/.clang-format b/test cases/unit/93 clangformat/.clang-format similarity index 100% rename from test cases/unit/94 clangformat/.clang-format rename to test cases/unit/93 clangformat/.clang-format
diff --git a/test cases/unit/94 clangformat/.clang-format-ignore b/test cases/unit/93 clangformat/.clang-format-ignore similarity index 100% rename from test cases/unit/94 clangformat/.clang-format-ignore rename to test cases/unit/93 clangformat/.clang-format-ignore
diff --git a/test cases/unit/94 clangformat/.clang-format-include b/test cases/unit/93 clangformat/.clang-format-include similarity index 100% rename from test cases/unit/94 clangformat/.clang-format-include rename to test cases/unit/93 clangformat/.clang-format-include
diff --git a/test cases/unit/94 clangformat/meson.build b/test cases/unit/93 clangformat/meson.build similarity index 100% rename from test cases/unit/94 clangformat/meson.build rename to test cases/unit/93 clangformat/meson.build
diff --git a/test cases/unit/94 clangformat/not-included/badformat.cpp b/test cases/unit/93 clangformat/not-included/badformat.cpp similarity index 100% rename from test cases/unit/94 clangformat/not-included/badformat.cpp rename to test cases/unit/93 clangformat/not-included/badformat.cpp
diff --git a/test cases/unit/94 clangformat/src/badformat.c b/test cases/unit/93 clangformat/src/badformat.c similarity index 100% rename from test cases/unit/94 clangformat/src/badformat.c rename to test cases/unit/93 clangformat/src/badformat.c
diff --git a/test cases/unit/94 clangformat/src/badformat.cpp b/test cases/unit/93 clangformat/src/badformat.cpp similarity index 100% rename from test cases/unit/94 clangformat/src/badformat.cpp rename to test cases/unit/93 clangformat/src/badformat.cpp
diff --git a/test cases/unit/95 custominc/easytogrepfor/genh.py b/test cases/unit/94 custominc/easytogrepfor/genh.py similarity index 100% rename from test cases/unit/95 custominc/easytogrepfor/genh.py rename to test cases/unit/94 custominc/easytogrepfor/genh.py
diff --git a/test cases/unit/95 custominc/easytogrepfor/meson.build b/test cases/unit/94 custominc/easytogrepfor/meson.build similarity index 100% rename from test cases/unit/95 custominc/easytogrepfor/meson.build rename to test cases/unit/94 custominc/easytogrepfor/meson.build
diff --git a/test cases/unit/95 custominc/helper.c b/test cases/unit/94 custominc/helper.c similarity index 100% rename from test cases/unit/95 custominc/helper.c rename to test cases/unit/94 custominc/helper.c
diff --git a/test cases/unit/95 custominc/meson.build b/test cases/unit/94 custominc/meson.build similarity index 100% rename from test cases/unit/95 custominc/meson.build rename to test cases/unit/94 custominc/meson.build
diff --git a/test cases/unit/95 custominc/prog.c b/test cases/unit/94 custominc/prog.c similarity index 100% rename from test cases/unit/95 custominc/prog.c rename to test cases/unit/94 custominc/prog.c
diff --git a/test cases/unit/95 custominc/prog2.c b/test cases/unit/94 custominc/prog2.c similarity index 100% rename from test cases/unit/95 custominc/prog2.c rename to test cases/unit/94 custominc/prog2.c
diff --git a/test cases/unit/96 implicit force fallback/meson.build b/test cases/unit/95 implicit force fallback/meson.build similarity index 100% rename from test cases/unit/96 implicit force fallback/meson.build rename to test cases/unit/95 implicit force fallback/meson.build
diff --git a/test cases/unit/96 implicit force fallback/subprojects/something/meson.build b/test cases/unit/95 implicit force fallback/subprojects/something/meson.build similarity index 100% rename from test cases/unit/96 implicit force fallback/subprojects/something/meson.build rename to test cases/unit/95 implicit force fallback/subprojects/something/meson.build
diff --git a/test cases/unit/97 compiler.links file arg/meson.build b/test cases/unit/96 compiler.links file arg/meson.build similarity index 100% rename from test cases/unit/97 compiler.links file arg/meson.build rename to test cases/unit/96 compiler.links file arg/meson.build
diff --git a/test cases/unit/97 compiler.links file arg/test.c b/test cases/unit/96 compiler.links file arg/test.c similarity index 100% rename from test cases/unit/97 compiler.links file arg/test.c rename to test cases/unit/96 compiler.links file arg/test.c
diff --git a/test cases/unit/98 link full name/.gitignore b/test cases/unit/97 link full name/.gitignore similarity index 100% rename from test cases/unit/98 link full name/.gitignore rename to test cases/unit/97 link full name/.gitignore
diff --git a/test cases/unit/98 link full name/libtestprovider/meson.build b/test cases/unit/97 link full name/libtestprovider/meson.build similarity index 100% rename from test cases/unit/98 link full name/libtestprovider/meson.build rename to test cases/unit/97 link full name/libtestprovider/meson.build
diff --git a/test cases/unit/98 link full name/libtestprovider/provider.c b/test cases/unit/97 link full name/libtestprovider/provider.c similarity index 100% rename from test cases/unit/98 link full name/libtestprovider/provider.c rename to test cases/unit/97 link full name/libtestprovider/provider.c
diff --git a/test cases/unit/98 link full name/proguser/meson.build b/test cases/unit/97 link full name/proguser/meson.build similarity index 100% rename from test cases/unit/98 link full name/proguser/meson.build rename to test cases/unit/97 link full name/proguser/meson.build
diff --git a/test cases/unit/98 link full name/proguser/receiver.c b/test cases/unit/97 link full name/proguser/receiver.c similarity index 100% rename from test cases/unit/98 link full name/proguser/receiver.c rename to test cases/unit/97 link full name/proguser/receiver.c
diff --git a/test cases/unit/99 install all targets/bar-custom.txt b/test cases/unit/98 install all targets/bar-custom.txt similarity index 100% rename from test cases/unit/99 install all targets/bar-custom.txt rename to test cases/unit/98 install all targets/bar-custom.txt
diff --git a/test cases/unit/99 install all targets/bar-devel.h b/test cases/unit/98 install all targets/bar-devel.h similarity index 100% rename from test cases/unit/99 install all targets/bar-devel.h rename to test cases/unit/98 install all targets/bar-devel.h
diff --git a/test cases/unit/99 install all targets/bar-notag.txt b/test cases/unit/98 install all targets/bar-notag.txt similarity index 100% rename from test cases/unit/99 install all targets/bar-notag.txt rename to test cases/unit/98 install all targets/bar-notag.txt
diff --git a/test cases/unit/99 install all targets/custom_files/data.txt b/test cases/unit/98 install all targets/custom_files/data.txt similarity index 100% rename from test cases/unit/99 install all targets/custom_files/data.txt rename to test cases/unit/98 install all targets/custom_files/data.txt
diff --git a/test cases/unit/99 install all targets/excludes/excluded.txt b/test cases/unit/98 install all targets/excludes/excluded.txt similarity index 100% rename from test cases/unit/99 install all targets/excludes/excluded.txt rename to test cases/unit/98 install all targets/excludes/excluded.txt
diff --git a/test cases/unit/99 install all targets/excludes/excluded/placeholder.txt b/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt similarity index 100% rename from test cases/unit/99 install all targets/excludes/excluded/placeholder.txt rename to test cases/unit/98 install all targets/excludes/excluded/placeholder.txt
diff --git a/test cases/unit/99 install all targets/excludes/installed.txt b/test cases/unit/98 install all targets/excludes/installed.txt similarity index 100% rename from test cases/unit/99 install all targets/excludes/installed.txt rename to test cases/unit/98 install all targets/excludes/installed.txt
diff --git a/test cases/unit/99 install all targets/foo.in b/test cases/unit/98 install all targets/foo.in similarity index 100% rename from test cases/unit/99 install all targets/foo.in rename to test cases/unit/98 install all targets/foo.in
diff --git a/test cases/unit/99 install all targets/foo1-devel.h b/test cases/unit/98 install all targets/foo1-devel.h similarity index 100% rename from test cases/unit/99 install all targets/foo1-devel.h rename to test cases/unit/98 install all targets/foo1-devel.h
diff --git a/test cases/unit/99 install all targets/lib.c b/test cases/unit/98 install all targets/lib.c similarity index 100% rename from test cases/unit/99 install all targets/lib.c rename to test cases/unit/98 install all targets/lib.c
diff --git a/test cases/unit/99 install all targets/main.c b/test cases/unit/98 install all targets/main.c similarity index 100% rename from test cases/unit/99 install all targets/main.c rename to test cases/unit/98 install all targets/main.c
diff --git a/test cases/unit/99 install all targets/meson.build b/test cases/unit/98 install all targets/meson.build similarity index 100% rename from test cases/unit/99 install all targets/meson.build rename to test cases/unit/98 install all targets/meson.build
diff --git a/test cases/unit/99 install all targets/script.py b/test cases/unit/98 install all targets/script.py similarity index 100% rename from test cases/unit/99 install all targets/script.py rename to test cases/unit/98 install all targets/script.py
diff --git a/test cases/unit/99 install all targets/subdir/bar2-devel.h b/test cases/unit/98 install all targets/subdir/bar2-devel.h similarity index 100% rename from test cases/unit/99 install all targets/subdir/bar2-devel.h rename to test cases/unit/98 install all targets/subdir/bar2-devel.h
diff --git a/test cases/unit/99 install all targets/subdir/foo2.in b/test cases/unit/98 install all targets/subdir/foo2.in similarity index 100% rename from test cases/unit/99 install all targets/subdir/foo2.in rename to test cases/unit/98 install all targets/subdir/foo2.in
diff --git a/test cases/unit/99 install all targets/subdir/foo3-devel.h b/test cases/unit/98 install all targets/subdir/foo3-devel.h similarity index 100% rename from test cases/unit/99 install all targets/subdir/foo3-devel.h rename to test cases/unit/98 install all targets/subdir/foo3-devel.h
diff --git a/test cases/unit/99 install all targets/subdir/lib.c b/test cases/unit/98 install all targets/subdir/lib.c similarity index 100% rename from test cases/unit/99 install all targets/subdir/lib.c rename to test cases/unit/98 install all targets/subdir/lib.c
diff --git a/test cases/unit/99 install all targets/subdir/main.c b/test cases/unit/98 install all targets/subdir/main.c similarity index 100% rename from test cases/unit/99 install all targets/subdir/main.c rename to test cases/unit/98 install all targets/subdir/main.c
diff --git a/test cases/unit/99 install all targets/subdir/meson.build b/test cases/unit/98 install all targets/subdir/meson.build similarity index 100% rename from test cases/unit/99 install all targets/subdir/meson.build rename to test cases/unit/98 install all targets/subdir/meson.build
diff --git a/test cases/unit/99 install all targets/subdir/script.py b/test cases/unit/98 install all targets/subdir/script.py similarity index 100% rename from test cases/unit/99 install all targets/subdir/script.py rename to test cases/unit/98 install all targets/subdir/script.py
diff --git a/test cases/unit/99 install all targets/subprojects/subproject/aaa.txt b/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt similarity index 100% rename from test cases/unit/99 install all targets/subprojects/subproject/aaa.txt rename to test cases/unit/98 install all targets/subprojects/subproject/aaa.txt
diff --git a/test cases/unit/99 install all targets/subprojects/subproject/bbb.txt b/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt similarity index 100% rename from test cases/unit/99 install all targets/subprojects/subproject/bbb.txt rename to test cases/unit/98 install all targets/subprojects/subproject/bbb.txt
diff --git a/test cases/unit/99 install all targets/subprojects/subproject/meson.build b/test cases/unit/98 install all targets/subprojects/subproject/meson.build similarity index 100% rename from test cases/unit/99 install all targets/subprojects/subproject/meson.build rename to test cases/unit/98 install all targets/subprojects/subproject/meson.build
diff --git a/test cases/unit/100 custom target name/file.txt.in b/test cases/unit/99 custom target name/file.txt.in similarity index 100% rename from test cases/unit/100 custom target name/file.txt.in rename to test cases/unit/99 custom target name/file.txt.in
diff --git a/test cases/unit/100 custom target name/meson.build b/test cases/unit/99 custom target name/meson.build similarity index 100% rename from test cases/unit/100 custom target name/meson.build rename to test cases/unit/99 custom target name/meson.build
diff --git a/test cases/unit/100 custom target name/subdir/meson.build b/test cases/unit/99 custom target name/subdir/meson.build similarity index 100% rename from test cases/unit/100 custom target name/subdir/meson.build rename to test cases/unit/99 custom target name/subdir/meson.build
diff --git a/test cases/warning/9 meson.options/meson.build b/test cases/warning/8 meson.options/meson.build similarity index 100% rename from test cases/warning/9 meson.options/meson.build rename to test cases/warning/8 meson.options/meson.build
diff --git a/test cases/warning/9 meson.options/meson.options b/test cases/warning/8 meson.options/meson.options similarity index 100% rename from test cases/warning/9 meson.options/meson.options rename to test cases/warning/8 meson.options/meson.options
diff --git a/test cases/warning/9 meson.options/subprojects/no-warn/meson.build b/test cases/warning/8 meson.options/subprojects/no-warn/meson.build similarity index 100% rename from test cases/warning/9 meson.options/subprojects/no-warn/meson.build rename to test cases/warning/8 meson.options/subprojects/no-warn/meson.build
diff --git a/test cases/warning/9 meson.options/subprojects/no-warn/meson.options b/test cases/warning/8 meson.options/subprojects/no-warn/meson.options similarity index 100% rename from test cases/warning/9 meson.options/subprojects/no-warn/meson.options rename to test cases/warning/8 meson.options/subprojects/no-warn/meson.options
diff --git a/test cases/warning/9 meson.options/subprojects/no-warn/meson_options.txt b/test cases/warning/8 meson.options/subprojects/no-warn/meson_options.txt similarity index 100% rename from test cases/warning/9 meson.options/subprojects/no-warn/meson_options.txt rename to test cases/warning/8 meson.options/subprojects/no-warn/meson_options.txt
diff --git a/test cases/warning/9 meson.options/test.json b/test cases/warning/8 meson.options/test.json similarity index 100% rename from test cases/warning/9 meson.options/test.json rename to test cases/warning/8 meson.options/test.json
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index ebcb1f5..83bfad0 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py
@@ -529,7 +529,7 @@ ''' if not shutil.which('xmllint'): raise SkipTest('xmllint not installed') - testdir = os.path.join(self.unit_test_dir, '112 replace unencodable xml chars') + testdir = os.path.join(self.unit_test_dir, '111 replace unencodable xml chars') self.init(testdir) tests_command_output = self.run_tests() junit_xml_logs = Path(self.logdir, 'testlog.junit.xml') @@ -690,7 +690,7 @@ self.run_tests() def test_implicit_forcefallback(self): - testdir = os.path.join(self.unit_test_dir, '96 implicit force fallback') + testdir = os.path.join(self.unit_test_dir, '95 implicit force fallback') with self.assertRaises(subprocess.CalledProcessError): self.init(testdir) self.init(testdir, extra_args=['--wrap-mode=forcefallback']) @@ -1442,7 +1442,7 @@ Test that conflicts between -D for builtin options and the corresponding long option are detected without false positives or negatives. ''' - testdir = os.path.join(self.unit_test_dir, '130 long opt vs D') + testdir = os.path.join(self.unit_test_dir, '129 long opt vs D') for opt in ['-Dsysconfdir=/etc', '-Dsysconfdir2=/etc']: exception_raised = False @@ -2188,7 +2188,7 @@ check_pcfile('libvartest2.pc', relocatable=False) self.wipe() - testdir_abs = os.path.join(self.unit_test_dir, '106 pkgconfig relocatable with absolute path') + testdir_abs = os.path.join(self.unit_test_dir, '105 pkgconfig relocatable with absolute path') self.init(testdir_abs) check_pcfile('libsimple.pc', relocatable=True, levels=3) @@ -2270,7 +2270,7 @@ self.assertDictEqual(original, expected) def test_executable_names(self): - testdir = os.path.join(self.unit_test_dir, '122 executable suffix') + testdir = os.path.join(self.unit_test_dir, '121 executable suffix') self.init(testdir) self.build() exe1 = os.path.join(self.builddir, 'foo' + exe_suffix) @@ -2361,7 +2361,7 @@ 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, '114 list build options') + testdir = os.path.join(self.unit_test_dir, '113 list build options') out = self.init(testdir) for line in out.splitlines(): @@ -2598,7 +2598,7 @@ self.assertIn(msg, out) def test_mixed_language_linker_check(self): - testdir = os.path.join(self.unit_test_dir, '97 compiler.links file arg') + testdir = os.path.join(self.unit_test_dir, '96 compiler.links file arg') self.init(testdir) cmds = self.get_meson_log_compiler_checks() self.assertEqual(len(cmds), 5) @@ -4462,7 +4462,7 @@ self.init(srcdir, extra_args=['-Dbuild.b_lto=true']) def test_install_skip_subprojects(self): - testdir = os.path.join(self.unit_test_dir, '92 install skip subprojects') + testdir = os.path.join(self.unit_test_dir, '91 install skip subprojects') self.init(testdir) self.build() @@ -4509,7 +4509,7 @@ check_installed_files(['--skip-subprojects', 'another'], all_expected) def test_adding_subproject_to_configure_project(self) -> None: - srcdir = os.path.join(self.unit_test_dir, '93 new subproject in configured project') + srcdir = os.path.join(self.unit_test_dir, '92 new subproject in configured project') self.init(srcdir) self.build() self.setconf('-Duse-sub=true') @@ -4563,7 +4563,7 @@ if not shutil.which('clang-format'): raise SkipTest('clang-format not found') - testdir = os.path.join(self.unit_test_dir, '94 clangformat') + testdir = os.path.join(self.unit_test_dir, '93 clangformat') newdir = os.path.join(self.builddir, 'testdir') shutil.copytree(testdir, newdir) self.new_builddir() @@ -4588,7 +4588,7 @@ self.build('clang-format-check') def test_custom_target_implicit_include(self): - testdir = os.path.join(self.unit_test_dir, '95 custominc') + testdir = os.path.join(self.unit_test_dir, '94 custominc') self.init(testdir) self.build() compdb = self.get_compdb() @@ -4634,7 +4634,7 @@ # self.assertEqual(sorted(link_args), sorted(['-flto'])) def test_install_tag(self) -> None: - testdir = os.path.join(self.unit_test_dir, '99 install all targets') + testdir = os.path.join(self.unit_test_dir, '98 install all targets') self.init(testdir) self.build() @@ -4805,7 +4805,7 @@ def test_introspect_install_plan(self): - testdir = os.path.join(self.unit_test_dir, '99 install all targets') + testdir = os.path.join(self.unit_test_dir, '98 install all targets') introfile = os.path.join(self.builddir, 'meson-info', 'intro-install_plan.json') self.init(testdir) self.assertPathExists(introfile) @@ -5141,7 +5141,7 @@ }} ''') - testdir = os.path.join(self.unit_test_dir, '102 rlib linkage') + testdir = os.path.join(self.unit_test_dir, '101 rlib linkage') gen_file = os.path.join(testdir, 'lib.rs') with open(gen_file, 'w', encoding='utf-8') as f: f.write(template.format(0)) @@ -5189,7 +5189,7 @@ return def test_custom_target_name(self): - testdir = os.path.join(self.unit_test_dir, '100 custom target name') + testdir = os.path.join(self.unit_test_dir, '99 custom target name') self.init(testdir) out = self.build() if self.backend is Backend.ninja: @@ -5197,7 +5197,7 @@ self.assertIn('Generating subdir/file.txt with a custom command', out) def test_symlinked_subproject(self): - testdir = os.path.join(self.unit_test_dir, '108 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') @@ -5213,7 +5213,7 @@ self.build() def test_configure_same_noop(self): - testdir = os.path.join(self.unit_test_dir, '110 configure same noop') + testdir = os.path.join(self.unit_test_dir, '109 configure same noop') args = [ '-Dstring=val', '-Dboolean=true', @@ -5251,7 +5251,7 @@ def __test_multi_stds(self, test_c: bool = True, test_objc: bool = False) -> None: assert test_c or test_objc, 'must test something' - testdir = os.path.join(self.unit_test_dir, '116 c cpp stds') + testdir = os.path.join(self.unit_test_dir, '115 c cpp stds') self.init(testdir, extra_args=[f'-Dwith-c={str(test_c).lower()}', f'-Dwith-objc={str(test_objc).lower()}']) # Invalid values should fail whatever compiler we have @@ -5310,7 +5310,7 @@ self.__test_multi_stds(test_objc=True) def test_slice(self): - testdir = os.path.join(self.unit_test_dir, '128 test slice') + testdir = os.path.join(self.unit_test_dir, '127 test slice') self.init(testdir) self.build() @@ -5348,7 +5348,7 @@ self.assertEqual(cc.linker.get_accepts_rsp(), has_rsp) def test_nonexisting_bargs(self): - testdir = os.path.join(self.unit_test_dir, '117 empty project') + testdir = os.path.join(self.unit_test_dir, '116 empty project') args = ['-Db_ndebug=if_release'] self.init(testdir, extra_args=args) @@ -5358,7 +5358,7 @@ self.init(testdir, extra_args=['--wipe']) def test_interactive_tap(self): - testdir = os.path.join(self.unit_test_dir, '125 interactive tap') + testdir = os.path.join(self.unit_test_dir, '124 interactive tap') self.init(testdir, extra_args=['--wrap-mode=forcefallback']) output = self._run(self.mtest_command + ['--interactive']) self.assertRegex(output, r'Ok:\s*0')
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index 073f03c..1b2607b 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py
@@ -1397,7 +1397,7 @@ see: https://github.com/mesonbuild/meson/issues/9000 https://stackoverflow.com/questions/48532868/gcc-library-option-with-a-colon-llibevent-a ''' - testdir = os.path.join(self.unit_test_dir, '98 link full name','libtestprovider') + testdir = os.path.join(self.unit_test_dir, '97 link full name','libtestprovider') oldprefix = self.prefix # install into installdir without using DESTDIR installdir = self.installdir @@ -1410,7 +1410,7 @@ self.new_builddir() env = {'LIBRARY_PATH': os.path.join(installdir, self.libdir), 'PKG_CONFIG_PATH': _prepend_pkg_config_path(os.path.join(installdir, self.libdir, 'pkgconfig'))} - testdir = os.path.join(self.unit_test_dir, '98 link full name','proguser') + testdir = os.path.join(self.unit_test_dir, '97 link full name','proguser') self.init(testdir,override_envvars=env) # test for link with full path @@ -1816,7 +1816,7 @@ @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, '104 strip') + testdir = os.path.join(self.unit_test_dir, '103 strip') self.init(testdir) self.build() @@ -1863,7 +1863,7 @@ 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, '111 freeze') + testdir = os.path.join(self.unit_test_dir, '110 freeze') self.init(testdir) self.build() with self.assertRaises(subprocess.CalledProcessError) as e: @@ -1872,7 +1872,7 @@ @skipUnless(is_linux(), "Ninja file differs on different platforms") def test_complex_link_cases(self): - testdir = os.path.join(self.unit_test_dir, '115 complex link cases') + testdir = os.path.join(self.unit_test_dir, '114 complex link cases') self.init(testdir) self.build() with open(os.path.join(self.builddir, 'build.ninja'), encoding='utf-8') as f: @@ -1893,11 +1893,11 @@ self.assertIn('build t13-e1: c_LINKER t13-e1.p/main.c.o | libt12-s1.a libt13-s3.a\n', content) def test_top_options_in_sp(self): - testdir = os.path.join(self.unit_test_dir, '127 pkgsubproj') + testdir = os.path.join(self.unit_test_dir, '126 pkgsubproj') self.init(testdir) def test_unreadable_dir_in_declare_dep(self): - testdir = os.path.join(self.unit_test_dir, '126 declare_dep var') + testdir = os.path.join(self.unit_test_dir, '125 declare_dep var') tmpdir = Path(tempfile.mkdtemp()) self.addCleanup(windows_proof_rmtree, tmpdir) declaredepdir = tmpdir / 'test' @@ -1919,7 +1919,7 @@ if self.backend is not Backend.ninja: raise SkipTest(f'{self.backend.name!r} backend can\'t install files') - testdir = os.path.join(self.unit_test_dir, '123 persp options') + testdir = os.path.join(self.unit_test_dir, '122 persp options') with self.subTest('init'): self.init(testdir, extra_args='-Doptimization=1') @@ -1972,7 +1972,7 @@ self.check_has_flag(compdb, sub2src, '-O2') def test_sanitizers(self): - testdir = os.path.join(self.unit_test_dir, '129 sanitizers') + testdir = os.path.join(self.unit_test_dir, '128 sanitizers') with self.subTest('no b_sanitize value'): try:
diff --git a/unittests/machinefiletests.py b/unittests/machinefiletests.py index e4687eb..7f88a54 100644 --- a/unittests/machinefiletests.py +++ b/unittests/machinefiletests.py
@@ -388,7 +388,7 @@ 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, '113 classpath') + testdir = os.path.join(self.unit_test_dir, '112 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 b0e4350..ebd5317 100644 --- a/unittests/platformagnostictests.py +++ b/unittests/platformagnostictests.py
@@ -33,7 +33,7 @@ Tests that find_program() with a relative path does not find the program in current workdir. ''' - testdir = os.path.join(self.unit_test_dir, '101 relative find program') + testdir = os.path.join(self.unit_test_dir, '100 relative find program') self.init(testdir, workdir=testdir) def test_invalid_option_names(self): @@ -92,11 +92,11 @@ interp.process, fname) def test_python_dependency_without_pkgconfig(self): - testdir = os.path.join(self.unit_test_dir, '103 python without pkgconfig') + testdir = os.path.join(self.unit_test_dir, '102 python without pkgconfig') self.init(testdir, override_envvars={'PKG_CONFIG': 'notfound'}) def test_vala_target_with_internal_glib(self): - testdir = os.path.join(self.unit_test_dir, '131 vala internal glib') + testdir = os.path.join(self.unit_test_dir, '130 vala internal glib') for run in [{ 'version': '2.84.4', 'expected': '2.84'}, { 'version': '2.85.2', 'expected': '2.84' }]: self.new_builddir() self.init(testdir, extra_args=[f'-Dglib-version={run["version"]}']) @@ -113,7 +113,7 @@ self.skipTest('Current backend does not produce introspection data') def test_debug_function_outputs_to_meson_log(self): - testdir = os.path.join(self.unit_test_dir, '105 debug function') + testdir = os.path.join(self.unit_test_dir, '104 debug function') log_msg = 'This is an example debug output, should only end up in debug log' output = self.init(testdir) @@ -125,7 +125,7 @@ self.assertIn(log_msg, mesonlog) def test_new_subproject_reconfigure(self): - testdir = os.path.join(self.unit_test_dir, '109 new subproject on reconfigure') + testdir = os.path.join(self.unit_test_dir, '108 new subproject on reconfigure') self.init(testdir) self.build() @@ -288,7 +288,7 @@ thing to do as new features are added, but keeping track of them is good. ''' - testdir = os.path.join(self.unit_test_dir, '117 empty project') + testdir = os.path.join(self.unit_test_dir, '116 empty project') self.init(testdir) self._run(self.meson_command + ['--internal', 'regenerate', '--profile-self', testdir, self.builddir]) @@ -303,7 +303,7 @@ def test_meson_package_cache_dir(self): # Copy testdir into temporary directory to not pollute meson source tree. - testdir = os.path.join(self.unit_test_dir, '119 meson package cache dir') + testdir = os.path.join(self.unit_test_dir, '118 meson package cache dir') srcdir = os.path.join(self.builddir, 'srctree') shutil.copytree(testdir, srcdir) builddir = os.path.join(srcdir, '_build') @@ -312,7 +312,7 @@ def test_cmake_openssl_not_found_bug(self): """Issue #12098""" - testdir = os.path.join(self.unit_test_dir, '120 openssl cmake bug') + testdir = os.path.join(self.unit_test_dir, '119 openssl cmake bug') self.meson_native_files.append(os.path.join(testdir, 'nativefile.ini')) out = self.init(testdir, allow_fail=True) self.assertNotIn('Unhandled python exception', out) @@ -422,7 +422,7 @@ self.assertIn(f'Did you mean to run meson from the directory: "{testdir}"?', out) def test_reconfigure_base_options(self): - testdir = os.path.join(self.unit_test_dir, '124 reconfigure base options') + testdir = os.path.join(self.unit_test_dir, '123 reconfigure base options') out = self.init(testdir, extra_args=['-Db_ndebug=true']) self.assertIn('\nMessage: b_ndebug: true\n', out) self.assertIn('\nMessage: c_std: c89\n', out) @@ -548,7 +548,7 @@ self.assertEqual(self.getconf('subproject:new_option'), True) def test_mtest_rebuild_deps(self): - testdir = os.path.join(self.unit_test_dir, '107 underspecified mtest') + testdir = os.path.join(self.unit_test_dir, '106 underspecified mtest') self.init(testdir) with self.assertRaises(subprocess.CalledProcessError):
diff --git a/unittests/rewritetests.py b/unittests/rewritetests.py index 11cac19..a479f3d 100644 --- a/unittests/rewritetests.py +++ b/unittests/rewritetests.py
@@ -449,7 +449,7 @@ self.assertEqualIgnoreOrder(out, expected) def test_raw_printer_is_idempotent(self): - test_path = Path(self.unit_test_dir, '121 rewrite') + test_path = Path(self.unit_test_dir, '120 rewrite') meson_build_file = test_path / 'meson.build' # original_contents = meson_build_file.read_bytes() original_contents = meson_build_file.read_text(encoding='utf-8')
diff --git a/unittests/windowstests.py b/unittests/windowstests.py index 9506a75..7fa4ab2 100644 --- a/unittests/windowstests.py +++ b/unittests/windowstests.py
@@ -185,7 +185,7 @@ if self.backend is not Backend.ninja: raise SkipTest('Test only applies when using the Ninja backend') - testdir = os.path.join(self.unit_test_dir, '118 genvslite') + testdir = os.path.join(self.unit_test_dir, '117 genvslite') env = get_fake_env(testdir, self.builddir, self.prefix) cc = detect_c_compiler(env, MachineChoice.HOST)