Skip to content

Commit

Permalink
Condense test directory numbers.
Browse files Browse the repository at this point in the history
  • Loading branch information
jpakkane committed Oct 24, 2022
1 parent 1a1aad3 commit 458dcf8
Show file tree
Hide file tree
Showing 111 changed files with 25 additions and 25 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"stdout": [
{
"line": "test cases/common/253 module warnings/meson.build:3: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.48.0': module python3."
"line": "test cases/common/255 module warnings/meson.build:3: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.48.0': module python3."
},
{
"line": "test cases/common/253 module warnings/meson.build:4: WARNING: Project targets '>= 0.56' but uses feature introduced in '0.60.0': module java."
"line": "test cases/common/255 module warnings/meson.build:4: WARNING: Project targets '>= 0.56' but uses feature introduced in '0.60.0': module java."
},
{
"line": "test cases/common/253 module warnings/meson.build:5: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.56.0': module keyval has been stabilized. drop \"unstable-\" prefix from the module name"
"line": "test cases/common/255 module warnings/meson.build:5: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.56.0': module keyval has been stabilized. drop \"unstable-\" prefix from the module name"
},
{
"line": "test cases/common/253 module warnings/meson.build:6: DEPRECATION: Importing unstable modules as \"unstable_simd\" instead of \"unstable-simd\""
"line": "test cases/common/255 module warnings/meson.build:6: DEPRECATION: Importing unstable modules as \"unstable_simd\" instead of \"unstable-simd\""
}
]
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
28 changes: 14 additions & 14 deletions unittests/allplatformstests.py
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,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'])
Expand Down Expand Up @@ -581,7 +581,7 @@ def test_verbose(self):
self.assertIn('1/1 subtest 1', out)

def test_long_output(self):
testdir = os.path.join(self.common_test_dir, '253 long output')
testdir = os.path.join(self.common_test_dir, '254 long output')
self.init(testdir)
self.build()
self.run_tests()
Expand Down Expand Up @@ -1749,7 +1749,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)
Expand Down Expand Up @@ -2112,7 +2112,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)
Expand Down Expand Up @@ -3878,7 +3878,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()

Expand Down Expand Up @@ -3924,7 +3924,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')
Expand All @@ -3947,7 +3947,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()
Expand All @@ -3972,7 +3972,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()
Expand Down Expand Up @@ -4012,7 +4012,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()

Expand Down Expand Up @@ -4159,7 +4159,7 @@ def do_install(tags, expected_files, expected_scripts):
do_install(None, expected_all, 2)

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)
Expand Down Expand Up @@ -4361,7 +4361,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') as f:
f.write(template.format(0))
Expand All @@ -4381,15 +4381,15 @@ def test_rust_rlib_linkage(self) -> None:
self.assertIn('exit status 39', cm.exception.stdout)

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, '107 subproject symlink')
testdir = os.path.join(self.unit_test_dir, '106 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')
Expand All @@ -4402,7 +4402,7 @@ def test_symlinked_subproject(self):
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, '108 configure same noop')
self.init(testdir, extra_args=['-Dopt=val'])

filename = os.path.join(self.privatedir, 'coredata.dat')
Expand Down
6 changes: 3 additions & 3 deletions unittests/linuxliketests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1350,7 +1350,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
Expand All @@ -1363,7 +1363,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
Expand Down Expand Up @@ -1775,7 +1775,7 @@ def test_cmake_multilib(self):

@skipUnless(is_linux(), 'Test only applicable to Linux')
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()

Expand Down
8 changes: 4 additions & 4 deletions unittests/platformagnostictests.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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):
Expand Down Expand Up @@ -71,11 +71,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)

Expand All @@ -88,7 +88,7 @@ def test_debug_function_outputs_to_meson_log(self):
self.assertIn(log_msg, file.read())

def test_new_subproject_reconfigure(self):
testdir = os.path.join(self.unit_test_dir, '108 new subproject on reconfigure')
testdir = os.path.join(self.unit_test_dir, '107 new subproject on reconfigure')
self.init(testdir)
self.build()

Expand Down

0 comments on commit 458dcf8

Please sign in to comment.