From eecef1e5a5879bcd3ac001a932d0c001364e9063 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Mon, 14 Oct 2019 03:44:47 +0000 Subject: [PATCH] clangd tests: use extended regex with sed The escaped parens seem to confuse the combination of lit, cygwin quoting, and cygwin's sed. unxutils sed in cmd.exe is fine with both forms, so use the extended regex form that doesn't need an escaped paren. llvm-svn: 374753 --- clang-tools-extra/clangd/test/compile-commands-path-in-initialize.test | 2 +- clang-tools-extra/clangd/test/system-include-extractor.test | 2 +- clang-tools-extra/clangd/test/target_info.test | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clang-tools-extra/clangd/test/compile-commands-path-in-initialize.test b/clang-tools-extra/clangd/test/compile-commands-path-in-initialize.test index 2905bad..034299d 100644 --- a/clang-tools-extra/clangd/test/compile-commands-path-in-initialize.test +++ b/clang-tools-extra/clangd/test/compile-commands-path-in-initialize.test @@ -10,7 +10,7 @@ # On Windows, we need the URI in didOpen to look like "uri":"file:///C:/..." # (with the extra slash in the front), so we add it here. -# RUN: sed -e "s|file://\([A-Z]\):/|file:///\1:/|g" %t.test.1 > %t.test +# RUN: sed -E -e "s|file://([A-Z]):/|file:///\1:/|g" %t.test.1 > %t.test # RUN: clangd -lit-test < %t.test | FileCheck -strict-whitespace %t.test diff --git a/clang-tools-extra/clangd/test/system-include-extractor.test b/clang-tools-extra/clangd/test/system-include-extractor.test index 431384d..b61ad7a 100644 --- a/clang-tools-extra/clangd/test/system-include-extractor.test +++ b/clang-tools-extra/clangd/test/system-include-extractor.test @@ -27,7 +27,7 @@ # RUN: sed -e "s|INPUT_DIR|%/t.dir|g" %s > %t.test.1 # On Windows, we need the URI in didOpen to look like "uri":"file:///C:/..." # (with the extra slash in the front), so we add it here. -# RUN: sed -e "s|file://\([A-Z]\):/|file:///\1:/|g" %t.test.1 > %t.test +# RUN: sed -E -e "s|file://([A-Z]):/|file:///\1:/|g" %t.test.1 > %t.test # Bless the mock driver we've just created so that clangd can execute it. # RUN: clangd -lit-test -query-driver="**.test,**.sh" < %t.test | FileCheck -strict-whitespace %t.test diff --git a/clang-tools-extra/clangd/test/target_info.test b/clang-tools-extra/clangd/test/target_info.test index 1e0cb99..ae45c34 100644 --- a/clang-tools-extra/clangd/test/target_info.test +++ b/clang-tools-extra/clangd/test/target_info.test @@ -9,7 +9,7 @@ # RUN: sed -e "s|INPUT_DIR|%/t.dir|g" %s > %t.test.1 # On Windows, we need the URI in didOpen to look like "uri":"file:///C:/..." # (with the extra slash in the front), so we add it here. -# RUN: sed -e "s|file://\([A-Z]\):/|file:///\1:/|g" %t.test.1 > %t.test +# RUN: sed -E -e "s|file://([A-Z]):/|file:///\1:/|g" %t.test.1 > %t.test # RUN: clangd -lit-test < %t.test 2>&1 | FileCheck -strict-whitespace %t.test {"jsonrpc":"2.0","id":0,"method":"initialize","params":{}} -- 2.7.4