Skip to content

Resolve symlinks before comparing #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Resolve symlinks before comparing #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,21 +1168,21 @@ def test(self):
target_prereqs = self.load_dependencies(self.cfilename + '.dmldep')
c_target = 'T_%s.c' % (self.shortname,)
dmldep_target = 'T_%s.dmldep' % (self.shortname,)
non_lib = {os.path.normpath(p) for p in target_prereqs[c_target]
non_lib = {Path(p).resolve() for p in target_prereqs[c_target]
if not p.startswith(project_host_path())}
# Main .c target depends on main DML file and all DML imports.
# We test that all non-library DML files are included, as well as
# one library file
self.expect_equal_sets(non_lib, {
os.path.normpath(join(testdir, '1.2', 'misc', f + '.dml'))
Path(join(testdir, '1.2', 'misc', f + '.dml')).resolve()
for f in ['T_import_rel_1', 'rel/a/x', 'rel/a/y',
'rel/z', 'rel/misc/rel/z']})
self.expect_equal_sets(target_prereqs[dmldep_target],
target_prereqs[c_target])
base_types_dml = os.path.join(
project_host_path(), 'bin', 'dml', 'api', latest_api_version,
'1.2', 'simics', 'base-types.dml')
if all(os.path.normpath(p) != os.path.normpath(base_types_dml)
if all(Path(p).resolve() != Path(base_types_dml).resolve()
for p in target_prereqs[c_target]):
raise TestFail('missing %s' % (base_types_dml,))
# each DML import has a dummy target, depending on nothing
Expand Down