Skip to content

Commit 85f8090

Browse files
authored
Merge pull request #66064 from edymtt/edymtt/relax-skip_clean_llbuild.test-5.8
[5.8] Relax FileCheck directives for `skip_clean_llbuild.test`
2 parents c7490af + 58729df commit 85f8090

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

utils/round-trip-syntax-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class RoundTripTask(object):
7474
logging.error(self.stderr.decode('utf-8', errors='replace'))
7575
raise RuntimeError()
7676

77-
contents = ''.join(map(lambda l: l.decode('utf-8', errors='replace'),
77+
contents = ''.join(map(lambda _: _.decode('utf-8', errors='replace'),
7878
open(self.input_filename, 'rb').readlines()))
7979
stdout_contents = self.stdout.decode('utf-8', errors='replace')
8080

validation-test/BuildSystem/skip_clean_llbuild.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
# RUN: mkdir -p %t
99
# RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --llbuild --skip-clean-llbuild --cmake %cmake 2>&1 | %FileCheck --check-prefix=SKIP-CLEAN-LLBUILD-CHECK %s
1010

11-
# CLEAN-LLBUILD-CHECK: Cleaning the llbuild build directory
12-
# CLEAN-LLBUILD-CHECK-NEXT: rm -rf
11+
# CLEAN-LLBUILD-CHECK-DAG: Cleaning the llbuild build directory
12+
# CLEAN-LLBUILD-CHECK: rm -rf
1313

1414
# SKIP-CLEAN-LLBUILD-CHECK-NOT: Cleaning the llbuild build directory
1515
# SKIP-CLEAN-LLBUILD-CHECK-NOT: rm -rf {{.*/llbuild-[^/]*}}

0 commit comments

Comments
 (0)