From 1534925f2171f56640840b324855ea3800d2442b Mon Sep 17 00:00:00 2001 From: Eric Miotto <1094986+edymtt@users.noreply.github.com> Date: Mon, 22 May 2023 10:55:53 -0700 Subject: [PATCH] Relax FileCheck directives for `skip_clean_llbuild.test` This is needed short term to allow the test to pass when running on Python 3.11 and later and avoid errors like ``` :44:1: note: non-matching line after previous match is here :1: DeprecationWarning: 'pipes' is deprecated and slated for removal in Python 3.13 ^ ``` Long term we want to replace uses of the obsolete `pipes.quotes` function with `shlex.quotes`. Addresses rdar://109664710 --- validation-test/BuildSystem/skip_clean_llbuild.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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-[^/]*}}