Skip to content

Commit debec90

Browse files
author
Vasileios Karakasis
authored
Merge branch 'master' into bugfix/crayvariables_check
2 parents 73536de + 278ed31 commit debec90

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

reframe/frontend/dependencies.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ def resolve_dep(src, dst):
6161
# c stands for check or case depending on the context
6262
# p stands for partition
6363
# e stands for environment
64-
# t stands for target
6564

6665
# We use an ordered dict here, because we need to keep the order of
6766
# partitions and environments
@@ -79,8 +78,23 @@ def resolve_dep(src, dst):
7978
if when((psrc, esrc), (pdst, edst)):
8079
c.deps.append(d)
8180
except DependencyError as e:
82-
getlogger().warning(f'{e}; skipping test case...')
83-
skipped_cases.append(c)
81+
getlogger().warning(f'{e}; skipping dependent test cases:')
82+
83+
# FIXME: we need to unit test this properly
84+
skip_nodes = {c}
85+
while skip_nodes:
86+
v = skip_nodes.pop()
87+
skipped_cases.append(v)
88+
getlogger().warning(f' - {v}')
89+
pruned_nodes = []
90+
for u, adj in graph.items():
91+
if v in adj:
92+
skip_nodes.add(u)
93+
pruned_nodes.append(u)
94+
95+
for u in pruned_nodes:
96+
del graph[u]
97+
8498
continue
8599

86100
graph[c] = util.OrderedSet(c.deps)

0 commit comments

Comments
 (0)