Condense directory names for 1.8 rc1.

Author: jpakkane

run_format_tests.py

@@ -51,7 +51,7 @@ def check_format() -> None:
         '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('.'):

test cases/common/282 subproj options/crossfile.ini renamed to test cases/common/281 subproj options/crossfile.ini

@@ -488,7 +488,7 @@ def test_replace_unencodable_xml_chars_unit(self):
         '''
         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 @@ def test_forcefallback(self):
         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 @@ def check_pcfile(name, *, relocatable, levels=2):
         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 @@ def get_opt():
         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_with_choices_changing(self) -> None:
 
     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 @@ def test_check_module_linking(self):
         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 @@ def test_build_b_options(self) -> None:
         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 @@ def check_installed_files(extra_args, expected):
         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 @@ def test_clang_format_check(self):
         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 @@ def test_clang_format_check(self):
         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 @@ def DISABLED_test_env_flags_to_linker(self) -> None:
             #    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_install_script_dry_run(self):
 
 
     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 @@ def test_rust_rlib_linkage(self) -> None:
                 }}
             ''')
 
-        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,15 +5033,15 @@ def test_bindgen_drops_invalid(self) -> None:
                 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:
             self.assertIn('Generating file.txt with a custom command', out)
             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 @@ def test_symlinked_subproject(self):
         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_configure_same_noop(self):
 
     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 @@ def test_c_cpp_objc_objcpp_stds(self) -> None:
         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 @@ def test_rsp_support(self):
         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)
 

test cases/common/282 subproj options/meson.build renamed to test cases/common/281 subproj options/meson.build

@@ -1363,7 +1363,7 @@ def test_link_arg_fullname(self):
         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 @@ def test_link_arg_fullname(self):
         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 @@ def test_cmake_multilib(self):
 
     @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 @@ def test_isystem_default_removal_with_symlink(self):
             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 @@ def test_freezing(self):
 
     @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 @@ def test_complex_link_cases(self):
         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 @@ def test_persp_options(self):
         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 @@ def test_persp_options(self):
             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:

test cases/common/282 subproj options/subprojects/sub/meson.build renamed to test cases/common/281 subproj options/subprojects/sub/meson.build

@@ -388,7 +388,7 @@ def test_java_compiler(self):
     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'))

test cases/common/282 subproj options/subprojects/sub/meson_options.txt renamed to test cases/common/281 subproj options/subprojects/sub/meson_options.txt

@@ -33,7 +33,7 @@ def test_relative_find_program(self):
         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 @@ def write_file(code: str):
                                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 @@ def test_debug_function_outputs_to_meson_log(self):
         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 @@ def test_setup_loaded_modules(self):
         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_setup_loaded_modules(self):
 
     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_meson_package_cache_dir(self):
 
     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 @@ def test_configure_new_option_subproject(self) -> None:
         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):

test cases/frameworks/38 gir both_libraries/bar.c renamed to test cases/frameworks/39 gir both_libraries/bar.c

@@ -391,7 +391,7 @@ def test_target_remove_extra_files(self):
         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')

test cases/frameworks/38 gir both_libraries/bar.h renamed to test cases/frameworks/39 gir both_libraries/bar.h

@@ -185,7 +185,7 @@ def test_genvslite(self):
         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)