Condense directory names for 1.8 rc1.
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 subproj options/crossfile.ini b/test cases/common/281 subproj options/crossfile.ini
similarity index 100%
rename from test cases/common/282 subproj options/crossfile.ini
rename to test cases/common/281 subproj options/crossfile.ini
diff --git a/test cases/common/282 subproj options/meson.build b/test cases/common/281 subproj options/meson.build
similarity index 100%
rename from test cases/common/282 subproj options/meson.build
rename to test cases/common/281 subproj options/meson.build
diff --git a/test cases/common/282 subproj options/subprojects/sub/meson.build b/test cases/common/281 subproj options/subprojects/sub/meson.build
similarity index 100%
rename from test cases/common/282 subproj options/subprojects/sub/meson.build
rename to test cases/common/281 subproj options/subprojects/sub/meson.build
diff --git a/test cases/common/282 subproj options/subprojects/sub/meson_options.txt b/test cases/common/281 subproj options/subprojects/sub/meson_options.txt
similarity index 100%
rename from test cases/common/282 subproj options/subprojects/sub/meson_options.txt
rename to test cases/common/281 subproj options/subprojects/sub/meson_options.txt
diff --git a/test cases/frameworks/38 gir both_libraries/bar.c b/test cases/frameworks/39 gir both_libraries/bar.c
similarity index 100%
rename from test cases/frameworks/38 gir both_libraries/bar.c
rename to test cases/frameworks/39 gir both_libraries/bar.c
diff --git a/test cases/frameworks/38 gir both_libraries/bar.h b/test cases/frameworks/39 gir both_libraries/bar.h
similarity index 100%
rename from test cases/frameworks/38 gir both_libraries/bar.h
rename to test cases/frameworks/39 gir both_libraries/bar.h
diff --git a/test cases/frameworks/38 gir both_libraries/foo.c b/test cases/frameworks/39 gir both_libraries/foo.c
similarity index 100%
rename from test cases/frameworks/38 gir both_libraries/foo.c
rename to test cases/frameworks/39 gir both_libraries/foo.c
diff --git a/test cases/frameworks/38 gir both_libraries/foo.h b/test cases/frameworks/39 gir both_libraries/foo.h
similarity index 100%
rename from test cases/frameworks/38 gir both_libraries/foo.h
rename to test cases/frameworks/39 gir both_libraries/foo.h
diff --git a/test cases/frameworks/38 gir both_libraries/meson.build b/test cases/frameworks/39 gir both_libraries/meson.build
similarity index 100%
rename from test cases/frameworks/38 gir both_libraries/meson.build
rename to test cases/frameworks/39 gir both_libraries/meson.build
diff --git a/test cases/frameworks/38 gir both_libraries/test.json b/test cases/frameworks/39 gir both_libraries/test.json
similarity index 100%
rename from test cases/frameworks/38 gir both_libraries/test.json
rename to test cases/frameworks/39 gir both_libraries/test.json
diff --git a/test cases/frameworks/39 qt qml/Basic.qml b/test cases/frameworks/40 qt qml/Basic.qml
similarity index 100%
rename from test cases/frameworks/39 qt qml/Basic.qml
rename to test cases/frameworks/40 qt qml/Basic.qml
diff --git a/test cases/frameworks/39 qt qml/Internal.qml b/test cases/frameworks/40 qt qml/Internal.qml
similarity index 100%
rename from test cases/frameworks/39 qt qml/Internal.qml
rename to test cases/frameworks/40 qt qml/Internal.qml
diff --git a/test cases/frameworks/39 qt qml/Main.qml b/test cases/frameworks/40 qt qml/Main.qml
similarity index 100%
rename from test cases/frameworks/39 qt qml/Main.qml
rename to test cases/frameworks/40 qt qml/Main.qml
diff --git a/test cases/frameworks/39 qt qml/QmlCppExposed.hpp b/test cases/frameworks/40 qt qml/QmlCppExposed.hpp
similarity index 100%
rename from test cases/frameworks/39 qt qml/QmlCppExposed.hpp
rename to test cases/frameworks/40 qt qml/QmlCppExposed.hpp
diff --git a/test cases/frameworks/39 qt qml/QmlCppOtherExposed.hpp b/test cases/frameworks/40 qt qml/QmlCppOtherExposed.hpp
similarity index 100%
rename from test cases/frameworks/39 qt qml/QmlCppOtherExposed.hpp
rename to test cases/frameworks/40 qt qml/QmlCppOtherExposed.hpp
diff --git a/test cases/frameworks/39 qt qml/QmlMain.cpp b/test cases/frameworks/40 qt qml/QmlMain.cpp
similarity index 100%
rename from test cases/frameworks/39 qt qml/QmlMain.cpp
rename to test cases/frameworks/40 qt qml/QmlMain.cpp
diff --git a/test cases/frameworks/39 qt qml/QmlSingleton.qml b/test cases/frameworks/40 qt qml/QmlSingleton.qml
similarity index 100%
rename from test cases/frameworks/39 qt qml/QmlSingleton.qml
rename to test cases/frameworks/40 qt qml/QmlSingleton.qml
diff --git a/test cases/frameworks/39 qt qml/custom_qmldir b/test cases/frameworks/40 qt qml/custom_qmldir
similarity index 100%
rename from test cases/frameworks/39 qt qml/custom_qmldir
rename to test cases/frameworks/40 qt qml/custom_qmldir
diff --git a/test cases/frameworks/39 qt qml/custom_qmldir.qrc b/test cases/frameworks/40 qt qml/custom_qmldir.qrc
similarity index 100%
rename from test cases/frameworks/39 qt qml/custom_qmldir.qrc
rename to test cases/frameworks/40 qt qml/custom_qmldir.qrc
diff --git a/test cases/frameworks/39 qt qml/meson.build b/test cases/frameworks/40 qt qml/meson.build
similarity index 100%
rename from test cases/frameworks/39 qt qml/meson.build
rename to test cases/frameworks/40 qt qml/meson.build
diff --git a/test cases/frameworks/39 qt qml/meson_options.txt b/test cases/frameworks/40 qt qml/meson_options.txt
similarity index 100%
rename from test cases/frameworks/39 qt qml/meson_options.txt
rename to test cases/frameworks/40 qt qml/meson_options.txt
diff --git a/test cases/frameworks/39 qt qml/subdir/SubdirHeader.hpp b/test cases/frameworks/40 qt qml/subdir/SubdirHeader.hpp
similarity index 100%
rename from test cases/frameworks/39 qt qml/subdir/SubdirHeader.hpp
rename to test cases/frameworks/40 qt qml/subdir/SubdirHeader.hpp
diff --git a/test cases/frameworks/39 qt qml/subdir/Thing.qml b/test cases/frameworks/40 qt qml/subdir/Thing.qml
similarity index 100%
rename from test cases/frameworks/39 qt qml/subdir/Thing.qml
rename to test cases/frameworks/40 qt qml/subdir/Thing.qml
diff --git a/test cases/frameworks/39 qt qml/test.json b/test cases/frameworks/40 qt qml/test.json
similarity index 100%
rename from test cases/frameworks/39 qt qml/test.json
rename to test cases/frameworks/40 qt qml/test.json
diff --git a/test cases/swift/13 file name matches module name/Library.swift b/test cases/swift/10 file name matches module name/Library.swift
similarity index 100%
rename from test cases/swift/13 file name matches module name/Library.swift
rename to test cases/swift/10 file name matches module name/Library.swift
diff --git a/test cases/swift/13 file name matches module name/Library2.swift b/test cases/swift/10 file name matches module name/Library2.swift
similarity index 100%
rename from test cases/swift/13 file name matches module name/Library2.swift
rename to test cases/swift/10 file name matches module name/Library2.swift
diff --git a/test cases/swift/13 file name matches module name/main.swift b/test cases/swift/10 file name matches module name/main.swift
similarity index 100%
rename from test cases/swift/13 file name matches module name/main.swift
rename to test cases/swift/10 file name matches module name/main.swift
diff --git a/test cases/swift/13 file name matches module name/meson.build b/test cases/swift/10 file name matches module name/meson.build
similarity index 100%
rename from test cases/swift/13 file name matches module name/meson.build
rename to test cases/swift/10 file name matches module name/meson.build
diff --git a/test cases/unit/101 relative find program/foo.py b/test cases/unit/100 relative find program/foo.py
similarity index 100%
rename from test cases/unit/101 relative find program/foo.py
rename to test cases/unit/100 relative find program/foo.py
diff --git a/test cases/unit/101 relative find program/meson.build b/test cases/unit/100 relative find program/meson.build
similarity index 100%
rename from test cases/unit/101 relative find program/meson.build
rename to test cases/unit/100 relative find program/meson.build
diff --git a/test cases/unit/101 relative find program/subdir/meson.build b/test cases/unit/100 relative find program/subdir/meson.build
similarity index 100%
rename from test cases/unit/101 relative find program/subdir/meson.build
rename to test cases/unit/100 relative find program/subdir/meson.build
diff --git a/test cases/unit/102 rlib linkage/lib2.rs b/test cases/unit/101 rlib linkage/lib2.rs
similarity index 100%
rename from test cases/unit/102 rlib linkage/lib2.rs
rename to test cases/unit/101 rlib linkage/lib2.rs
diff --git a/test cases/unit/102 rlib linkage/main.rs b/test cases/unit/101 rlib linkage/main.rs
similarity index 100%
rename from test cases/unit/102 rlib linkage/main.rs
rename to test cases/unit/101 rlib linkage/main.rs
diff --git a/test cases/unit/102 rlib linkage/meson.build b/test cases/unit/101 rlib linkage/meson.build
similarity index 100%
rename from test cases/unit/102 rlib linkage/meson.build
rename to test cases/unit/101 rlib linkage/meson.build
diff --git a/test cases/unit/103 python without pkgconfig/meson.build b/test cases/unit/102 python without pkgconfig/meson.build
similarity index 100%
rename from test cases/unit/103 python without pkgconfig/meson.build
rename to test cases/unit/102 python without pkgconfig/meson.build
diff --git a/test cases/unit/104 strip/lib.c b/test cases/unit/103 strip/lib.c
similarity index 100%
rename from test cases/unit/104 strip/lib.c
rename to test cases/unit/103 strip/lib.c
diff --git a/test cases/unit/104 strip/meson.build b/test cases/unit/103 strip/meson.build
similarity index 100%
rename from test cases/unit/104 strip/meson.build
rename to test cases/unit/103 strip/meson.build
diff --git a/test cases/unit/105 debug function/meson.build b/test cases/unit/104 debug function/meson.build
similarity index 100%
rename from test cases/unit/105 debug function/meson.build
rename to test cases/unit/104 debug function/meson.build
diff --git a/test cases/unit/106 pkgconfig relocatable with absolute path/meson.build b/test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
similarity index 100%
rename from test cases/unit/106 pkgconfig relocatable with absolute path/meson.build
rename to test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
diff --git a/test cases/unit/107 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 pkgsubproj/meson.build b/test cases/unit/125 pkgsubproj/meson.build
similarity index 100%
rename from test cases/unit/124 pkgsubproj/meson.build
rename to test cases/unit/125 pkgsubproj/meson.build
diff --git a/test cases/unit/124 pkgsubproj/subprojects/sub/meson.build b/test cases/unit/125 pkgsubproj/subprojects/sub/meson.build
similarity index 100%
rename from test cases/unit/124 pkgsubproj/subprojects/sub/meson.build
rename to test cases/unit/125 pkgsubproj/subprojects/sub/meson.build
diff --git a/test cases/unit/124 test slice/meson.build b/test cases/unit/126 test slice/meson.build
similarity index 100%
rename from test cases/unit/124 test slice/meson.build
rename to test cases/unit/126 test slice/meson.build
diff --git a/test cases/unit/124 test slice/test.py b/test cases/unit/126 test slice/test.py
similarity index 100%
rename from test cases/unit/124 test slice/test.py
rename to test cases/unit/126 test slice/test.py
diff --git a/test cases/unit/125 sanitizers/meson.build b/test cases/unit/127 sanitizers/meson.build
similarity index 100%
rename from test cases/unit/125 sanitizers/meson.build
rename to test cases/unit/127 sanitizers/meson.build
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/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 71f8828..412723c 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -488,7 +488,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')
@@ -648,7 +648,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'])
@@ -2082,7 +2082,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)
@@ -2164,7 +2164,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)
@@ -2255,7 +2255,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():
@@ -2493,7 +2493,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)
@@ -4331,7 +4331,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()
@@ -4378,7 +4378,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')
@@ -4428,7 +4428,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()
@@ -4453,7 +4453,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()
@@ -4499,7 +4499,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()
@@ -4670,7 +4670,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)
@@ -4985,7 +4985,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))
@@ -5033,7 +5033,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:
@@ -5041,7 +5041,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')
@@ -5057,7 +5057,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',
@@ -5095,7 +5095,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
@@ -5154,7 +5154,7 @@
self.__test_multi_stds(test_objc=True)
def test_slice(self):
- testdir = os.path.join(self.unit_test_dir, '124 test slice')
+ testdir = os.path.join(self.unit_test_dir, '126 test slice')
self.init(testdir)
self.build()
@@ -5192,7 +5192,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)
diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
index 03b57b9..db7068d 100644
--- a/unittests/linuxliketests.py
+++ b/unittests/linuxliketests.py
@@ -1363,7 +1363,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
@@ -1376,7 +1376,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
@@ -1782,7 +1782,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()
@@ -1829,7 +1829,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:
@@ -1838,7 +1838,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:
@@ -1859,7 +1859,7 @@
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, '124 pkgsubproj')
+ testdir = os.path.join(self.unit_test_dir, '125 pkgsubproj')
self.init(testdir)
def check_has_flag(self, compdb, src, argument):
@@ -1873,7 +1873,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')
@@ -1926,7 +1926,7 @@
self.check_has_flag(compdb, sub2src, '-O2')
def test_sanitizers(self):
- testdir = os.path.join(self.unit_test_dir, '125 sanitizers')
+ testdir = os.path.join(self.unit_test_dir, '127 sanitizers')
with self.subTest('no b_sanitize value'):
try:
diff --git a/unittests/machinefiletests.py b/unittests/machinefiletests.py
index 9aa1eb4..b2839e6 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 0010608..d6c0078 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_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)
@@ -108,7 +108,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()
@@ -271,7 +271,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])
@@ -286,7 +286,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')
@@ -295,7 +295,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)
@@ -521,7 +521,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 169c035..57a6782 100644
--- a/unittests/rewritetests.py
+++ b/unittests/rewritetests.py
@@ -391,7 +391,7 @@
self.assertDictEqual(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)
