Condense test directories.

pull/13808/head
Jussi Pakkanen 1 month ago
parent 5cc511b1e6
commit fbeedf4b14
  1. 0
      test cases/common/280 pkgconfig-gen/meson.build
  2. 0
      test cases/common/280 pkgconfig-gen/simple.c
  3. 0
      test cases/common/280 pkgconfig-gen/simple.h
  4. 0
      test cases/common/280 pkgconfig-gen/simple2/exports.def
  5. 0
      test cases/common/280 pkgconfig-gen/simple2/meson.build
  6. 0
      test cases/common/280 pkgconfig-gen/simple2/simple2.c
  7. 0
      test cases/common/280 pkgconfig-gen/simple2/simple2.h
  8. 0
      test cases/common/280 pkgconfig-gen/test.json
  9. 0
      test cases/unit/100 relative find program/foo.py
  10. 0
      test cases/unit/100 relative find program/meson.build
  11. 0
      test cases/unit/100 relative find program/subdir/meson.build
  12. 0
      test cases/unit/101 rlib linkage/lib2.rs
  13. 0
      test cases/unit/101 rlib linkage/main.rs
  14. 0
      test cases/unit/101 rlib linkage/meson.build
  15. 0
      test cases/unit/102 python without pkgconfig/meson.build
  16. 0
      test cases/unit/103 strip/lib.c
  17. 0
      test cases/unit/103 strip/meson.build
  18. 0
      test cases/unit/104 debug function/meson.build
  19. 0
      test cases/unit/105 pkgconfig relocatable with absolute path/meson.build
  20. 0
      test cases/unit/91 install skip subprojects/foo.c
  21. 0
      test cases/unit/91 install skip subprojects/foo.dat
  22. 0
      test cases/unit/91 install skip subprojects/foo.h
  23. 0
      test cases/unit/91 install skip subprojects/foo/foofile
  24. 0
      test cases/unit/91 install skip subprojects/meson.build
  25. 0
      test cases/unit/91 install skip subprojects/subprojects/bar/bar.c
  26. 0
      test cases/unit/91 install skip subprojects/subprojects/bar/bar.dat
  27. 0
      test cases/unit/91 install skip subprojects/subprojects/bar/bar.h
  28. 0
      test cases/unit/91 install skip subprojects/subprojects/bar/bar/barfile
  29. 0
      test cases/unit/91 install skip subprojects/subprojects/bar/meson.build
  30. 0
      test cases/unit/92 new subproject in configured project/meson.build
  31. 0
      test cases/unit/92 new subproject in configured project/meson_options.txt
  32. 0
      test cases/unit/92 new subproject in configured project/subprojects/sub/foo.c
  33. 0
      test cases/unit/92 new subproject in configured project/subprojects/sub/meson.build
  34. 0
      test cases/unit/93 clangformat/.clang-format
  35. 0
      test cases/unit/93 clangformat/.clang-format-ignore
  36. 0
      test cases/unit/93 clangformat/.clang-format-include
  37. 0
      test cases/unit/93 clangformat/meson.build
  38. 0
      test cases/unit/93 clangformat/not-included/badformat.cpp
  39. 0
      test cases/unit/93 clangformat/src/badformat.c
  40. 0
      test cases/unit/93 clangformat/src/badformat.cpp
  41. 0
      test cases/unit/94 custominc/easytogrepfor/genh.py
  42. 0
      test cases/unit/94 custominc/easytogrepfor/meson.build
  43. 0
      test cases/unit/94 custominc/helper.c
  44. 0
      test cases/unit/94 custominc/meson.build
  45. 0
      test cases/unit/94 custominc/prog.c
  46. 0
      test cases/unit/94 custominc/prog2.c
  47. 0
      test cases/unit/95 implicit force fallback/meson.build
  48. 0
      test cases/unit/95 implicit force fallback/subprojects/something/meson.build
  49. 0
      test cases/unit/96 compiler.links file arg/meson.build
  50. 0
      test cases/unit/96 compiler.links file arg/test.c
  51. 0
      test cases/unit/97 link full name/.gitignore
  52. 0
      test cases/unit/97 link full name/libtestprovider/meson.build
  53. 0
      test cases/unit/97 link full name/libtestprovider/provider.c
  54. 0
      test cases/unit/97 link full name/proguser/meson.build
  55. 0
      test cases/unit/97 link full name/proguser/receiver.c
  56. 0
      test cases/unit/98 install all targets/bar-custom.txt
  57. 0
      test cases/unit/98 install all targets/bar-devel.h
  58. 0
      test cases/unit/98 install all targets/bar-notag.txt
  59. 0
      test cases/unit/98 install all targets/custom_files/data.txt
  60. 0
      test cases/unit/98 install all targets/excludes/excluded.txt
  61. 0
      test cases/unit/98 install all targets/excludes/excluded/placeholder.txt
  62. 0
      test cases/unit/98 install all targets/excludes/installed.txt
  63. 0
      test cases/unit/98 install all targets/foo.in
  64. 0
      test cases/unit/98 install all targets/foo1-devel.h
  65. 0
      test cases/unit/98 install all targets/lib.c
  66. 0
      test cases/unit/98 install all targets/main.c
  67. 0
      test cases/unit/98 install all targets/meson.build
  68. 0
      test cases/unit/98 install all targets/script.py
  69. 0
      test cases/unit/98 install all targets/subdir/bar2-devel.h
  70. 0
      test cases/unit/98 install all targets/subdir/foo2.in
  71. 0
      test cases/unit/98 install all targets/subdir/foo3-devel.h
  72. 0
      test cases/unit/98 install all targets/subdir/lib.c
  73. 0
      test cases/unit/98 install all targets/subdir/main.c
  74. 0
      test cases/unit/98 install all targets/subdir/meson.build
  75. 0
      test cases/unit/98 install all targets/subdir/script.py
  76. 0
      test cases/unit/98 install all targets/subprojects/subproject/aaa.txt
  77. 0
      test cases/unit/98 install all targets/subprojects/subproject/bbb.txt
  78. 0
      test cases/unit/98 install all targets/subprojects/subproject/meson.build
  79. 0
      test cases/unit/99 custom target name/file.txt.in
  80. 0
      test cases/unit/99 custom target name/meson.build
  81. 0
      test cases/unit/99 custom target name/subdir/meson.build
  82. 22
      unittests/allplatformstests.py
  83. 6
      unittests/linuxliketests.py
  84. 6
      unittests/platformagnostictests.py

@ -627,7 +627,7 @@ class AllPlatformTests(BasePlatformTests):
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 @@ class AllPlatformTests(BasePlatformTests):
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 @@ class AllPlatformTests(BasePlatformTests):
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 @@ 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, '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 @@ 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, '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 @@ class AllPlatformTests(BasePlatformTests):
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 @@ class AllPlatformTests(BasePlatformTests):
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 @@ class AllPlatformTests(BasePlatformTests):
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 @@ class AllPlatformTests(BasePlatformTests):
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 @@ class AllPlatformTests(BasePlatformTests):
}}
''')
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 @@ class AllPlatformTests(BasePlatformTests):
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:

@ -1333,7 +1333,7 @@ class LinuxlikeTests(BasePlatformTests):
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 @@ class LinuxlikeTests(BasePlatformTests):
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 @@ class LinuxlikeTests(BasePlatformTests):
@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()

@ -32,7 +32,7 @@ class PlatformAgnosticTests(BasePlatformTests):
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 @@ class PlatformAgnosticTests(BasePlatformTests):
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)

Loading…
Cancel
Save