Author: nico Date: Sun Oct 13 20:44:47 2019 New Revision: 374753 URL: http://llvm.org/viewvc/llvm-project?rev=374753&view=rev Log: 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. Modified: clang-tools-extra/trunk/clangd/test/compile-commands-path-in-initialize.test clang-tools-extra/trunk/clangd/test/system-include-extractor.test clang-tools-extra/trunk/clangd/test/target_info.test Modified: clang-tools-extra/trunk/clangd/test/compile-commands-path-in-initialize.test URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/test/compile-commands-path-in-initialize.test?rev=374753&r1=374752&r2=374753&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/test/compile-commands-path-in-initialize.test (original) +++ clang-tools-extra/trunk/clangd/test/compile-commands-path-in-initialize.test Sun Oct 13 20:44:47 2019 @@ -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 Modified: clang-tools-extra/trunk/clangd/test/system-include-extractor.test URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/test/system-include-extractor.test?rev=374753&r1=374752&r2=374753&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/test/system-include-extractor.test (original) +++ clang-tools-extra/trunk/clangd/test/system-include-extractor.test Sun Oct 13 20:44:47 2019 @@ -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 Modified: clang-tools-extra/trunk/clangd/test/target_info.test URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/test/target_info.test?rev=374753&r1=374752&r2=374753&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/test/target_info.test (original) +++ clang-tools-extra/trunk/clangd/test/target_info.test Sun Oct 13 20:44:47 2019 @@ -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":{}} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits