Condense test directory names for 1.9.

1 files changed, 21 insertions, 21 deletions

diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index c006961ad..535e479a6 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -529,7 +529,7 @@ class AllPlatformTests(BasePlatformTests):
         '''
         if not shutil.which('xmllint'):
             raise SkipTest('xmllint not installed')
-        testdir = os.path.join(self.unit_test_dir, '111 replace unencodable xml chars')
+        testdir = os.path.join(self.unit_test_dir, '112 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 @@ class AllPlatformTests(BasePlatformTests):
         self.run_tests()
 
     def test_implicit_forcefallback(self):
-        testdir = os.path.join(self.unit_test_dir, '95 implicit force fallback')
+        testdir = os.path.join(self.unit_test_dir, '96 implicit force fallback')
         with self.assertRaises(subprocess.CalledProcessError):
             self.init(testdir)
         self.init(testdir, extra_args=['--wrap-mode=forcefallback'])
@@ -1442,7 +1442,7 @@ class AllPlatformTests(BasePlatformTests):
         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, '128 long opt vs D')
+        testdir = os.path.join(self.unit_test_dir, '130 long opt vs D')
 
         for opt in ['-Dsysconfdir=/etc', '-Dsysconfdir2=/etc']:
             exception_raised = False
@@ -2188,7 +2188,7 @@ class AllPlatformTests(BasePlatformTests):
         check_pcfile('libvartest2.pc', relocatable=False)
 
         self.wipe()
-        testdir_abs = os.path.join(self.unit_test_dir, '105 pkgconfig relocatable with absolute path')
+        testdir_abs = os.path.join(self.unit_test_dir, '106 pkgconfig relocatable with absolute path')
         self.init(testdir_abs)
 
         check_pcfile('libsimple.pc', relocatable=True, levels=3)
@@ -2270,7 +2270,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertDictEqual(original, expected)
 
     def test_executable_names(self):
-        testdir = os.path.join(self.unit_test_dir, '121 executable suffix')
+        testdir = os.path.join(self.unit_test_dir, '122 executable suffix')
         self.init(testdir)
         self.build()
         exe1 = os.path.join(self.builddir, 'foo' + exe_suffix)
@@ -2361,7 +2361,7 @@ class AllPlatformTests(BasePlatformTests):
 
     def test_options_listed_in_build_options(self) -> None:
         """Detect when changed options become listed in build options."""
-        testdir = os.path.join(self.unit_test_dir, '113 list build options')
+        testdir = os.path.join(self.unit_test_dir, '114 list build options')
 
         out = self.init(testdir)
         for line in out.splitlines():
@@ -2598,7 +2598,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertIn(msg, out)
 
     def test_mixed_language_linker_check(self):
-        testdir = os.path.join(self.unit_test_dir, '96 compiler.links file arg')
+        testdir = os.path.join(self.unit_test_dir, '97 compiler.links file arg')
         self.init(testdir)
         cmds = self.get_meson_log_compiler_checks()
         self.assertEqual(len(cmds), 5)
@@ -4443,7 +4443,7 @@ class AllPlatformTests(BasePlatformTests):
         self.init(srcdir, extra_args=['-Dbuild.b_lto=true'])
 
     def test_install_skip_subprojects(self):
-        testdir = os.path.join(self.unit_test_dir, '91 install skip subprojects')
+        testdir = os.path.join(self.unit_test_dir, '92 install skip subprojects')
         self.init(testdir)
         self.build()
 
@@ -4490,7 +4490,7 @@ class AllPlatformTests(BasePlatformTests):
         check_installed_files(['--skip-subprojects', 'another'], all_expected)
 
     def test_adding_subproject_to_configure_project(self) -> None:
-        srcdir = os.path.join(self.unit_test_dir, '92 new subproject in configured project')
+        srcdir = os.path.join(self.unit_test_dir, '93 new subproject in configured project')
         self.init(srcdir)
         self.build()
         self.setconf('-Duse-sub=true')
@@ -4544,7 +4544,7 @@ class AllPlatformTests(BasePlatformTests):
         if not shutil.which('clang-format'):
             raise SkipTest('clang-format not found')
 
-        testdir = os.path.join(self.unit_test_dir, '93 clangformat')
+        testdir = os.path.join(self.unit_test_dir, '94 clangformat')
         newdir = os.path.join(self.builddir, 'testdir')
         shutil.copytree(testdir, newdir)
         self.new_builddir()
@@ -4569,7 +4569,7 @@ class AllPlatformTests(BasePlatformTests):
         self.build('clang-format-check')
 
     def test_custom_target_implicit_include(self):
-        testdir = os.path.join(self.unit_test_dir, '94 custominc')
+        testdir = os.path.join(self.unit_test_dir, '95 custominc')
         self.init(testdir)
         self.build()
         compdb = self.get_compdb()
@@ -4615,7 +4615,7 @@ class AllPlatformTests(BasePlatformTests):
             #    self.assertEqual(sorted(link_args), sorted(['-flto']))
 
     def test_install_tag(self) -> None:
-        testdir = os.path.join(self.unit_test_dir, '98 install all targets')
+        testdir = os.path.join(self.unit_test_dir, '99 install all targets')
         self.init(testdir)
         self.build()
 
@@ -4786,7 +4786,7 @@ class AllPlatformTests(BasePlatformTests):
 
 
     def test_introspect_install_plan(self):
-        testdir = os.path.join(self.unit_test_dir, '98 install all targets')
+        testdir = os.path.join(self.unit_test_dir, '99 install all targets')
         introfile = os.path.join(self.builddir, 'meson-info', 'intro-install_plan.json')
         self.init(testdir)
         self.assertPathExists(introfile)
@@ -5122,7 +5122,7 @@ class AllPlatformTests(BasePlatformTests):
                 }}
             ''')
 
-        testdir = os.path.join(self.unit_test_dir, '101 rlib linkage')
+        testdir = os.path.join(self.unit_test_dir, '102 rlib linkage')
         gen_file = os.path.join(testdir, 'lib.rs')
         with open(gen_file, 'w', encoding='utf-8') as f:
             f.write(template.format(0))
@@ -5170,7 +5170,7 @@ class AllPlatformTests(BasePlatformTests):
                 return
 
     def test_custom_target_name(self):
-        testdir = os.path.join(self.unit_test_dir, '99 custom target name')
+        testdir = os.path.join(self.unit_test_dir, '100 custom target name')
         self.init(testdir)
         out = self.build()
         if self.backend is Backend.ninja:
@@ -5178,7 +5178,7 @@ class AllPlatformTests(BasePlatformTests):
             self.assertIn('Generating subdir/file.txt with a custom command', out)
 
     def test_symlinked_subproject(self):
-        testdir = os.path.join(self.unit_test_dir, '107 subproject symlink')
+        testdir = os.path.join(self.unit_test_dir, '108 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')
@@ -5194,7 +5194,7 @@ class AllPlatformTests(BasePlatformTests):
         self.build()
 
     def test_configure_same_noop(self):
-        testdir = os.path.join(self.unit_test_dir, '109 configure same noop')
+        testdir = os.path.join(self.unit_test_dir, '110 configure same noop')
         args = [
             '-Dstring=val',
             '-Dboolean=true',
@@ -5232,7 +5232,7 @@ class AllPlatformTests(BasePlatformTests):
 
     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, '115 c cpp stds')
+        testdir = os.path.join(self.unit_test_dir, '116 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
@@ -5291,7 +5291,7 @@ class AllPlatformTests(BasePlatformTests):
         self.__test_multi_stds(test_objc=True)
 
     def test_slice(self):
-        testdir = os.path.join(self.unit_test_dir, '126 test slice')
+        testdir = os.path.join(self.unit_test_dir, '128 test slice')
         self.init(testdir)
         self.build()
 
@@ -5329,7 +5329,7 @@ class AllPlatformTests(BasePlatformTests):
         self.assertEqual(cc.linker.get_accepts_rsp(), has_rsp)
 
     def test_nonexisting_bargs(self):
-        testdir = os.path.join(self.unit_test_dir, '116 empty project')
+        testdir = os.path.join(self.unit_test_dir, '117 empty project')
         args = ['-Db_ndebug=if_release']
         self.init(testdir, extra_args=args)
 
@@ -5339,7 +5339,7 @@ class AllPlatformTests(BasePlatformTests):
         self.init(testdir, extra_args=['--wipe'])
 
     def test_interactive_tap(self):
-        testdir = os.path.join(self.unit_test_dir, '124 interactive tap')
+        testdir = os.path.join(self.unit_test_dir, '125 interactive tap')
         self.init(testdir, extra_args=['--wrap-mode=forcefallback'])
         output = self._run(self.mtest_command + ['--interactive'])
         self.assertRegex(output, r'Ok:\s*0')