Condense test directories.

mesonbuild · Oct 20, 2024 · fbeedf4 · fbeedf4
1 parent 5cc511b
commit fbeedf4
Show file tree

Hide file tree

Showing 84 changed files with 17 additions and 17 deletions.
diff --git a/...ases/common/279 pkgconfig-gen/meson.build → ...ases/common/280 pkgconfig-gen/meson.build b/...ases/common/279 pkgconfig-gen/meson.build → ...ases/common/280 pkgconfig-gen/meson.build
diff --git a/test cases/common/279 pkgconfig-gen/simple.c → test cases/common/280 pkgconfig-gen/simple.c b/test cases/common/279 pkgconfig-gen/simple.c → test cases/common/280 pkgconfig-gen/simple.c
diff --git a/test cases/common/279 pkgconfig-gen/simple.h → test cases/common/280 pkgconfig-gen/simple.h b/test cases/common/279 pkgconfig-gen/simple.h → test cases/common/280 pkgconfig-gen/simple.h
diff --git a/...mon/279 pkgconfig-gen/simple2/exports.def → ...mon/280 pkgconfig-gen/simple2/exports.def b/...mon/279 pkgconfig-gen/simple2/exports.def → ...mon/280 pkgconfig-gen/simple2/exports.def
diff --git a/...mon/279 pkgconfig-gen/simple2/meson.build → ...mon/280 pkgconfig-gen/simple2/meson.build b/...mon/279 pkgconfig-gen/simple2/meson.build → ...mon/280 pkgconfig-gen/simple2/meson.build
diff --git a/...ommon/279 pkgconfig-gen/simple2/simple2.c → ...ommon/280 pkgconfig-gen/simple2/simple2.c b/...ommon/279 pkgconfig-gen/simple2/simple2.c → ...ommon/280 pkgconfig-gen/simple2/simple2.c
diff --git a/...ommon/279 pkgconfig-gen/simple2/simple2.h → ...ommon/280 pkgconfig-gen/simple2/simple2.h b/...ommon/279 pkgconfig-gen/simple2/simple2.h → ...ommon/280 pkgconfig-gen/simple2/simple2.h
diff --git a/... cases/common/279 pkgconfig-gen/test.json → ... cases/common/280 pkgconfig-gen/test.json b/... cases/common/279 pkgconfig-gen/test.json → ... cases/common/280 pkgconfig-gen/test.json
diff --git a/...ses/unit/101 relative find program/foo.py → ...ses/unit/100 relative find program/foo.py b/...ses/unit/101 relative find program/foo.py → ...ses/unit/100 relative find program/foo.py
diff --git a/...nit/101 relative find program/meson.build → ...nit/100 relative find program/meson.build b/...nit/101 relative find program/meson.build → ...nit/100 relative find program/meson.build
diff --git a/... relative find program/subdir/meson.build → ... relative find program/subdir/meson.build b/... relative find program/subdir/meson.build → ... relative find program/subdir/meson.build
diff --git a/test cases/unit/102 rlib linkage/lib2.rs → test cases/unit/101 rlib linkage/lib2.rs b/test cases/unit/102 rlib linkage/lib2.rs → test cases/unit/101 rlib linkage/lib2.rs
diff --git a/test cases/unit/102 rlib linkage/main.rs → test cases/unit/101 rlib linkage/main.rs b/test cases/unit/102 rlib linkage/main.rs → test cases/unit/101 rlib linkage/main.rs
diff --git a/test cases/unit/102 rlib linkage/meson.build → test cases/unit/101 rlib linkage/meson.build b/test cases/unit/102 rlib linkage/meson.build → test cases/unit/101 rlib linkage/meson.build
diff --git a/.../103 python without pkgconfig/meson.build → .../102 python without pkgconfig/meson.build b/.../103 python without pkgconfig/meson.build → .../102 python without pkgconfig/meson.build
diff --git a/test cases/unit/104 strip/lib.c → test cases/unit/103 strip/lib.c b/test cases/unit/104 strip/lib.c → test cases/unit/103 strip/lib.c
diff --git a/test cases/unit/104 strip/meson.build → test cases/unit/103 strip/meson.build b/test cases/unit/104 strip/meson.build → test cases/unit/103 strip/meson.build
diff --git a/...cases/unit/105 debug function/meson.build → ...cases/unit/104 debug function/meson.build b/...cases/unit/105 debug function/meson.build → ...cases/unit/104 debug function/meson.build
diff --git a/...elocatable with absolute path/meson.build → ...elocatable with absolute path/meson.build b/...elocatable with absolute path/meson.build → ...elocatable with absolute path/meson.build
diff --git a/...es/unit/92 install skip subprojects/foo.c → ...es/unit/91 install skip subprojects/foo.c b/...es/unit/92 install skip subprojects/foo.c → ...es/unit/91 install skip subprojects/foo.c
diff --git a/.../unit/92 install skip subprojects/foo.dat → .../unit/91 install skip subprojects/foo.dat b/.../unit/92 install skip subprojects/foo.dat → .../unit/91 install skip subprojects/foo.dat
diff --git a/...es/unit/92 install skip subprojects/foo.h → ...es/unit/91 install skip subprojects/foo.h b/...es/unit/92 install skip subprojects/foo.h → ...es/unit/91 install skip subprojects/foo.h
diff --git a/...t/92 install skip subprojects/foo/foofile → ...t/91 install skip subprojects/foo/foofile b/...t/92 install skip subprojects/foo/foofile → ...t/91 install skip subprojects/foo/foofile
diff --git a/...t/92 install skip subprojects/meson.build → ...t/91 install skip subprojects/meson.build b/...t/92 install skip subprojects/meson.build → ...t/91 install skip subprojects/meson.build
diff --git a/...ll skip subprojects/subprojects/bar/bar.c → ...ll skip subprojects/subprojects/bar/bar.c b/...ll skip subprojects/subprojects/bar/bar.c → ...ll skip subprojects/subprojects/bar/bar.c
diff --git a/... skip subprojects/subprojects/bar/bar.dat → ... skip subprojects/subprojects/bar/bar.dat b/... skip subprojects/subprojects/bar/bar.dat → ... skip subprojects/subprojects/bar/bar.dat
diff --git a/...ll skip subprojects/subprojects/bar/bar.h → ...ll skip subprojects/subprojects/bar/bar.h b/...ll skip subprojects/subprojects/bar/bar.h → ...ll skip subprojects/subprojects/bar/bar.h
diff --git a/...p subprojects/subprojects/bar/bar/barfile → ...p subprojects/subprojects/bar/bar/barfile b/...p subprojects/subprojects/bar/bar/barfile → ...p subprojects/subprojects/bar/bar/barfile
diff --git a/...p subprojects/subprojects/bar/meson.build → ...p subprojects/subprojects/bar/meson.build b/...p subprojects/subprojects/bar/meson.build → ...p subprojects/subprojects/bar/meson.build
diff --git a/...project in configured project/meson.build → ...project in configured project/meson.build b/...project in configured project/meson.build → ...project in configured project/meson.build
diff --git a/...t in configured project/meson_options.txt → ...t in configured project/meson_options.txt b/...t in configured project/meson_options.txt → ...t in configured project/meson_options.txt
diff --git a/... configured project/subprojects/sub/foo.c → ... configured project/subprojects/sub/foo.c b/... configured project/subprojects/sub/foo.c → ... configured project/subprojects/sub/foo.c
diff --git a/...gured project/subprojects/sub/meson.build → ...gured project/subprojects/sub/meson.build b/...gured project/subprojects/sub/meson.build → ...gured project/subprojects/sub/meson.build
diff --git a/test cases/unit/94 clangformat/.clang-format → test cases/unit/93 clangformat/.clang-format b/test cases/unit/94 clangformat/.clang-format → test cases/unit/93 clangformat/.clang-format
diff --git a/.../unit/94 clangformat/.clang-format-ignore → .../unit/93 clangformat/.clang-format-ignore b/.../unit/94 clangformat/.clang-format-ignore → .../unit/93 clangformat/.clang-format-ignore
diff --git a/...unit/94 clangformat/.clang-format-include → ...unit/93 clangformat/.clang-format-include b/...unit/94 clangformat/.clang-format-include → ...unit/93 clangformat/.clang-format-include
diff --git a/test cases/unit/94 clangformat/meson.build → test cases/unit/93 clangformat/meson.build b/test cases/unit/94 clangformat/meson.build → test cases/unit/93 clangformat/meson.build
diff --git a/...94 clangformat/not-included/badformat.cpp → ...93 clangformat/not-included/badformat.cpp b/...94 clangformat/not-included/badformat.cpp → ...93 clangformat/not-included/badformat.cpp
diff --git a/...cases/unit/94 clangformat/src/badformat.c → ...cases/unit/93 clangformat/src/badformat.c b/...cases/unit/94 clangformat/src/badformat.c → ...cases/unit/93 clangformat/src/badformat.c
diff --git a/...ses/unit/94 clangformat/src/badformat.cpp → ...ses/unit/93 clangformat/src/badformat.cpp b/...ses/unit/94 clangformat/src/badformat.cpp → ...ses/unit/93 clangformat/src/badformat.cpp
diff --git a/...s/unit/95 custominc/easytogrepfor/genh.py → ...s/unit/94 custominc/easytogrepfor/genh.py b/...s/unit/95 custominc/easytogrepfor/genh.py → ...s/unit/94 custominc/easytogrepfor/genh.py
diff --git a/...it/95 custominc/easytogrepfor/meson.build → ...it/94 custominc/easytogrepfor/meson.build b/...it/95 custominc/easytogrepfor/meson.build → ...it/94 custominc/easytogrepfor/meson.build
diff --git a/test cases/unit/95 custominc/helper.c → test cases/unit/94 custominc/helper.c b/test cases/unit/95 custominc/helper.c → test cases/unit/94 custominc/helper.c
diff --git a/test cases/unit/95 custominc/meson.build → test cases/unit/94 custominc/meson.build b/test cases/unit/95 custominc/meson.build → test cases/unit/94 custominc/meson.build
diff --git a/test cases/unit/95 custominc/prog.c → test cases/unit/94 custominc/prog.c b/test cases/unit/95 custominc/prog.c → test cases/unit/94 custominc/prog.c
diff --git a/test cases/unit/95 custominc/prog2.c → test cases/unit/94 custominc/prog2.c b/test cases/unit/95 custominc/prog2.c → test cases/unit/94 custominc/prog2.c
diff --git a/...it/96 implicit force fallback/meson.build → ...it/95 implicit force fallback/meson.build b/...it/96 implicit force fallback/meson.build → ...it/95 implicit force fallback/meson.build
diff --git a/...allback/subprojects/something/meson.build → ...allback/subprojects/something/meson.build b/...allback/subprojects/something/meson.build → ...allback/subprojects/something/meson.build
diff --git a/...it/97 compiler.links file arg/meson.build → ...it/96 compiler.links file arg/meson.build b/...it/97 compiler.links file arg/meson.build → ...it/96 compiler.links file arg/meson.build
diff --git a/...es/unit/97 compiler.links file arg/test.c → ...es/unit/96 compiler.links file arg/test.c b/...es/unit/97 compiler.links file arg/test.c → ...es/unit/96 compiler.links file arg/test.c
diff --git a/test cases/unit/98 link full name/.gitignore → test cases/unit/97 link full name/.gitignore b/test cases/unit/98 link full name/.gitignore → test cases/unit/97 link full name/.gitignore
diff --git a/...ink full name/libtestprovider/meson.build → ...ink full name/libtestprovider/meson.build b/...ink full name/libtestprovider/meson.build → ...ink full name/libtestprovider/meson.build
diff --git a/...link full name/libtestprovider/provider.c → ...link full name/libtestprovider/provider.c b/...link full name/libtestprovider/provider.c → ...link full name/libtestprovider/provider.c
diff --git a/...it/98 link full name/proguser/meson.build → ...it/97 link full name/proguser/meson.build b/...it/98 link full name/proguser/meson.build → ...it/97 link full name/proguser/meson.build
diff --git a/...nit/98 link full name/proguser/receiver.c → ...nit/97 link full name/proguser/receiver.c b/...nit/98 link full name/proguser/receiver.c → ...nit/97 link full name/proguser/receiver.c
diff --git a/...nit/99 install all targets/bar-custom.txt → ...nit/98 install all targets/bar-custom.txt b/...nit/99 install all targets/bar-custom.txt → ...nit/98 install all targets/bar-custom.txt
diff --git a/...s/unit/99 install all targets/bar-devel.h → ...s/unit/98 install all targets/bar-devel.h b/...s/unit/99 install all targets/bar-devel.h → ...s/unit/98 install all targets/bar-devel.h
diff --git a/...unit/99 install all targets/bar-notag.txt → ...unit/98 install all targets/bar-notag.txt b/...unit/99 install all targets/bar-notag.txt → ...unit/98 install all targets/bar-notag.txt
diff --git a/...install all targets/custom_files/data.txt → ...install all targets/custom_files/data.txt b/...install all targets/custom_files/data.txt → ...install all targets/custom_files/data.txt
diff --git a/...install all targets/excludes/excluded.txt → ...install all targets/excludes/excluded.txt b/...install all targets/excludes/excluded.txt → ...install all targets/excludes/excluded.txt
diff --git a/...targets/excludes/excluded/placeholder.txt → ...targets/excludes/excluded/placeholder.txt b/...targets/excludes/excluded/placeholder.txt → ...targets/excludes/excluded/placeholder.txt
diff --git a/...nstall all targets/excludes/installed.txt → ...nstall all targets/excludes/installed.txt b/...nstall all targets/excludes/installed.txt → ...nstall all targets/excludes/installed.txt
diff --git a/... cases/unit/99 install all targets/foo.in → ... cases/unit/98 install all targets/foo.in b/... cases/unit/99 install all targets/foo.in → ... cases/unit/98 install all targets/foo.in
diff --git a/.../unit/99 install all targets/foo1-devel.h → .../unit/98 install all targets/foo1-devel.h b/.../unit/99 install all targets/foo1-devel.h → .../unit/98 install all targets/foo1-devel.h
diff --git a/test cases/unit/99 install all targets/lib.c → test cases/unit/98 install all targets/lib.c b/test cases/unit/99 install all targets/lib.c → test cases/unit/98 install all targets/lib.c
diff --git a/... cases/unit/99 install all targets/main.c → ... cases/unit/98 install all targets/main.c b/... cases/unit/99 install all targets/main.c → ... cases/unit/98 install all targets/main.c
diff --git a/...s/unit/99 install all targets/meson.build → ...s/unit/98 install all targets/meson.build b/...s/unit/99 install all targets/meson.build → ...s/unit/98 install all targets/meson.build
diff --git a/...ses/unit/99 install all targets/script.py → ...ses/unit/98 install all targets/script.py b/...ses/unit/99 install all targets/script.py → ...ses/unit/98 install all targets/script.py
diff --git a/...9 install all targets/subdir/bar2-devel.h → ...8 install all targets/subdir/bar2-devel.h b/...9 install all targets/subdir/bar2-devel.h → ...8 install all targets/subdir/bar2-devel.h
diff --git a/...nit/99 install all targets/subdir/foo2.in → ...nit/98 install all targets/subdir/foo2.in b/...nit/99 install all targets/subdir/foo2.in → ...nit/98 install all targets/subdir/foo2.in
diff --git a/...9 install all targets/subdir/foo3-devel.h → ...8 install all targets/subdir/foo3-devel.h b/...9 install all targets/subdir/foo3-devel.h → ...8 install all targets/subdir/foo3-devel.h
diff --git a/.../unit/99 install all targets/subdir/lib.c → .../unit/98 install all targets/subdir/lib.c b/.../unit/99 install all targets/subdir/lib.c → .../unit/98 install all targets/subdir/lib.c
diff --git a/...unit/99 install all targets/subdir/main.c → ...unit/98 install all targets/subdir/main.c b/...unit/99 install all targets/subdir/main.c → ...unit/98 install all targets/subdir/main.c
diff --git a/...99 install all targets/subdir/meson.build → ...98 install all targets/subdir/meson.build b/...99 install all targets/subdir/meson.build → ...98 install all targets/subdir/meson.build
diff --git a/...t/99 install all targets/subdir/script.py → ...t/98 install all targets/subdir/script.py b/...t/99 install all targets/subdir/script.py → ...t/98 install all targets/subdir/script.py
diff --git a/...ll targets/subprojects/subproject/aaa.txt → ...ll targets/subprojects/subproject/aaa.txt b/...ll targets/subprojects/subproject/aaa.txt → ...ll targets/subprojects/subproject/aaa.txt
diff --git a/...ll targets/subprojects/subproject/bbb.txt → ...ll targets/subprojects/subproject/bbb.txt b/...ll targets/subprojects/subproject/bbb.txt → ...ll targets/subprojects/subproject/bbb.txt
diff --git a/...argets/subprojects/subproject/meson.build → ...argets/subprojects/subproject/meson.build b/...argets/subprojects/subproject/meson.build → ...argets/subprojects/subproject/meson.build
diff --git a/...s/unit/100 custom target name/file.txt.in → ...es/unit/99 custom target name/file.txt.in b/...s/unit/100 custom target name/file.txt.in → ...es/unit/99 custom target name/file.txt.in
diff --git a/...s/unit/100 custom target name/meson.build → ...es/unit/99 custom target name/meson.build b/...s/unit/100 custom target name/meson.build → ...es/unit/99 custom target name/meson.build
diff --git a/...100 custom target name/subdir/meson.build → .../99 custom target name/subdir/meson.build b/...100 custom target name/subdir/meson.build → .../99 custom target name/subdir/meson.build
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
@@ -627,7 +627,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'])
@@ -2061,7 +2061,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)
@@ -2472,7 +2472,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)
@@ -4297,7 +4297,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()
 
@@ -4344,7 +4344,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')
@@ -4394,7 +4394,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()
@@ -4419,7 +4419,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()
@@ -4459,7 +4459,7 @@ def 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()
 
@@ -4630,7 +4630,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)
@@ -4902,7 +4902,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))
@@ -4950,7 +4950,7 @@ 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:

diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
@@ -1333,7 +1333,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
@@ -1346,7 +1346,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
@@ -1752,7 +1752,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()
 

diff --git a/unittests/platformagnostictests.py b/unittests/platformagnostictests.py
@@ -32,7 +32,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):
@@ -91,11 +91,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)