llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-format Author: Douglas Yung (dyung) <details> <summary>Changes</summary> Fixing the issue introduced by #<!-- -->204908, and attempted to be fixed by #<!-- -->205036. There were several issues that I identified: - diff is not available by default on Windows (replace with fc.exe) - touch is not available by default on Windows (replace with echo.) - fc command does not accept paths with forward slashes instead of backslashes - The generated cmd.exe command contained some double quotes which needed to be escaped (or removed, I did the latter) I ran the changes here on my bot that was failing and it was able to successfully complete all testing. --- Full diff: https://github.com/llvm/llvm-project/pull/205225.diff 1 Files Affected: - (modified) clang/lib/Format/CMakeLists.txt (+22-8) ``````````diff diff --git a/clang/lib/Format/CMakeLists.txt b/clang/lib/Format/CMakeLists.txt index 3e19151790440..998fa68282217 100644 --- a/clang/lib/Format/CMakeLists.txt +++ b/clang/lib/Format/CMakeLists.txt @@ -41,17 +41,31 @@ file(GLOB_RECURSE files ${CLANG_SOURCE_DIR}/unittests/Format/*.h ) +find_program(DIFF_EXE diff) set(check_format_depends) set(i 0) foreach(file IN LISTS files) - add_custom_command(OUTPUT check_format_depend_${i} - COMMAND clang-format ${file} | diff -u ${file} - && - touch check_format_depend_${i} - VERBATIM - COMMENT "Checking format of ${file}" - DEPENDS clang-format - ${file} - ) + if(NOT DIFF_EXE AND WIN32) + file(TO_NATIVE_PATH ${file} src_path) + file(TO_NATIVE_PATH ${file}.tmp tmp_path) + add_custom_command(OUTPUT check_format_depend_${i} + COMMAND clang-format ${src_path} > ${tmp_path} && fc ${src_path} ${tmp_path} && del ${tmp_path} && + echo. > check_format_depend_${i} + VERBATIM + COMMENT "Checking format of ${file}" + DEPENDS clang-format + ${file} + ) + else() + add_custom_command(OUTPUT check_format_depend_${i} + COMMAND clang-format ${file} | diff -u ${file} - && + touch check_format_depend_${i} + VERBATIM + COMMENT "Checking format of ${file}" + DEPENDS clang-format + ${file} + ) + endif() list(APPEND check_format_depends check_format_depend_${i}) math(EXPR i ${i}+1) endforeach() `````````` </details> https://github.com/llvm/llvm-project/pull/205225 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
