diff --git a/utils/round-trip-syntax-test b/utils/round-trip-syntax-test index 5dd3c83436c36..8ad3849bf7b09 100755 --- a/utils/round-trip-syntax-test +++ b/utils/round-trip-syntax-test @@ -74,7 +74,7 @@ class RoundTripTask(object): logging.error(self.stderr.decode('utf-8', errors='replace')) raise RuntimeError() - contents = ''.join(map(lambda l: l.decode('utf-8', errors='replace'), + contents = ''.join(map(lambda _: _.decode('utf-8', errors='replace'), open(self.input_filename, 'rb').readlines())) stdout_contents = self.stdout.decode('utf-8', errors='replace') diff --git a/validation-test/BuildSystem/skip_clean_llbuild.test b/validation-test/BuildSystem/skip_clean_llbuild.test index 7a9e6adf4aa2e..725402046d94d 100644 --- a/validation-test/BuildSystem/skip_clean_llbuild.test +++ b/validation-test/BuildSystem/skip_clean_llbuild.test @@ -8,8 +8,8 @@ # RUN: mkdir -p %t # 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 -# CLEAN-LLBUILD-CHECK: Cleaning the llbuild build directory -# CLEAN-LLBUILD-CHECK-NEXT: rm -rf +# CLEAN-LLBUILD-CHECK-DAG: Cleaning the llbuild build directory +# CLEAN-LLBUILD-CHECK: rm -rf # SKIP-CLEAN-LLBUILD-CHECK-NOT: Cleaning the llbuild build directory # SKIP-CLEAN-LLBUILD-CHECK-NOT: rm -rf {{.*/llbuild-[^/]*}}