Fix stray CR in test CMakeLists and validate line endings in cmake files (#41289)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
ggarzia-MSFT committed
Aug 7, 2026 at 13:40 UTC
0b67220d93b30f1e5cd2b9821bbc499ad2609c75
4 files changed
+67
-65
src/windows/WslcSDK/CMakeLists.txt
+1
-1
@@ -30,4 +30,4 @@ endif()
30
add_dependencies(wslcsdk wslserviceidl wslcsdkwinrt)
31
target_link_libraries(wslcsdk ${COMMON_LINK_LIBRARIES} ${MSI_LINK_LIBRARIES} legacy_stdio_definitions common wslcsdkwinrt delayimp.lib)
32
set_target_properties(wslcsdk PROPERTIES LINK_FLAGS "/DELAYLOAD:msi.dll /DELAYLOAD:WINTRUST.dll")
33
-target_precompile_headers(wslcsdk REUSE_FROM common)
33
+target_precompile_headers(wslcsdk REUSE_FROM common)
src/windows/WslcSDK/winrt/CMakeLists.txt
+2
-2
@@ -12,7 +12,7 @@ set(SOURCES
12
ImageProgress.cpp
13
InstallOptions.cpp
14
InstallProgress.cpp
15
- Process.cpp
15
+ Process.cpp
16
ProcessCrashInformation.cpp
17
ProcessSettings.cpp
18
PullImageOptions.cpp
@@ -38,7 +38,7 @@ set(HEADERS
38
ImageProgress.h
39
InstallOptions.h
40
InstallProgress.h
41
- Process.h
41
+ Process.h
42
ProcessCrashInformation.h
43
ProcessSettings.h
44
PullImageOptions.h
test/windows/CMakeLists.txt
+60
-60
@@ -1,60 +1,60 @@
1
-set(SOURCES
2
- SimpleTests.cpp
3
- UnitTests.cpp
4
- MountTests.cpp
5
- NetworkTests.cpp
6
- Plan9Tests.cpp
7
- DrvFsTests.cpp
8
- Common.cpp
9
- PluginTests.cpp
10
- PolicyTests.cpp
11
- InstallerTests.cpp
12
- WSLCTests.cpp
13
- WslcSdkTests.cpp
14
- WslcSdkWinRtTests.cpp
15
- WindowsUpdateTests.cpp)
16
-
17
-set(HEADERS
18
- Common.h
19
- PluginTests.h
20
- lxsstest.h)
21
-
22
-add_compile_definitions(INLINE_TEST_METHOD_MARKUP)
23
-
24
-add_library(wsltests SHARED ${SOURCES} ${HEADERS})
25
-
26
-if (DEFINED WSL_TEST_UNITY_BATCH_SIZE AND WSL_TEST_UNITY_BATCH_SIZE GREATER 0)
27
- set_target_properties(wsltests PROPERTIES
28
- UNITY_BUILD ON
29
- UNITY_BUILD_MODE BATCH
30
- UNITY_BUILD_BATCH_SIZE ${WSL_TEST_UNITY_BATCH_SIZE})
31
-endif ()
32
-
33
-target_include_directories(wsltests PRIVATE
34
- ${CMAKE_SOURCE_DIR}/src/windows/WslcSDK
35
- ${CMAKE_BINARY_DIR}/src/windows/WslcSDK/winrt/${TARGET_PLATFORM}/${CMAKE_BUILD_TYPE})
36
-target_link_directories(wsltests PRIVATE ${BIN})
37
-target_precompile_headers(wsltests REUSE_FROM common)
38
-target_link_libraries(wsltests
39
- common
40
- wslclib
41
- wslcsdk
42
- ${TAEF_LINK_LIBRARIES}
43
- ${COMMON_LINK_LIBRARIES}
44
- ${MSI_LINK_LIBRARIES}
45
- ${HCS_LINK_LIBRARIES}
46
- yaml-cpp
47
- ${SERVICE_LINK_LIBRARIES}
48
- VirtDisk.lib
49
- Wer.lib
50
- Dbghelp.lib
51
- sfc.lib
52
- Crypt32.lib
53
- Ncrypt.lib)
54
-
55
-add_dependencies(wsltests wslserviceidl wslclib wslc wslcsdk wslcsdkwinrtidl)
56
-add_subdirectory(testplugin)
57
-add_subdirectory(wslc)
58
-
59
-# For prettier source tree browsing
60
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} ${HEADERS})
1
+set(SOURCES
2
+ SimpleTests.cpp
3
+ UnitTests.cpp
4
+ MountTests.cpp
5
+ NetworkTests.cpp
6
+ Plan9Tests.cpp
7
+ DrvFsTests.cpp
8
+ Common.cpp
9
+ PluginTests.cpp
10
+ PolicyTests.cpp
11
+ InstallerTests.cpp
12
+ WSLCTests.cpp
13
+ WslcSdkTests.cpp
14
+ WslcSdkWinRtTests.cpp
15
+ WindowsUpdateTests.cpp)
16
+
17
+set(HEADERS
18
+ Common.h
19
+ PluginTests.h
20
+ lxsstest.h)
21
+
22
+add_compile_definitions(INLINE_TEST_METHOD_MARKUP)
23
+
24
+add_library(wsltests SHARED ${SOURCES} ${HEADERS})
25
+
26
+if (DEFINED WSL_TEST_UNITY_BATCH_SIZE AND WSL_TEST_UNITY_BATCH_SIZE GREATER 0)
27
+ set_target_properties(wsltests PROPERTIES
28
+ UNITY_BUILD ON
29
+ UNITY_BUILD_MODE BATCH
30
+ UNITY_BUILD_BATCH_SIZE ${WSL_TEST_UNITY_BATCH_SIZE})
31
+endif ()
32
+
33
+target_include_directories(wsltests PRIVATE
34
+ ${CMAKE_SOURCE_DIR}/src/windows/WslcSDK
35
+ ${CMAKE_BINARY_DIR}/src/windows/WslcSDK/winrt/${TARGET_PLATFORM}/${CMAKE_BUILD_TYPE})
36
+target_link_directories(wsltests PRIVATE ${BIN})
37
+target_precompile_headers(wsltests REUSE_FROM common)
38
+target_link_libraries(wsltests
39
+ common
40
+ wslclib
41
+ wslcsdk
42
+ ${TAEF_LINK_LIBRARIES}
43
+ ${COMMON_LINK_LIBRARIES}
44
+ ${MSI_LINK_LIBRARIES}
45
+ ${HCS_LINK_LIBRARIES}
46
+ yaml-cpp
47
+ ${SERVICE_LINK_LIBRARIES}
48
+ VirtDisk.lib
49
+ Wer.lib
50
+ Dbghelp.lib
51
+ sfc.lib
52
+ Crypt32.lib
53
+ Ncrypt.lib)
54
+
55
+add_dependencies(wsltests wslserviceidl wslclib wslc wslcsdk wslcsdkwinrtidl)
56
+add_subdirectory(testplugin)
57
+add_subdirectory(wslc)
58
+
59
+# For prettier source tree browsing
60
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} ${HEADERS})
tools/devops/validate-line-endings.py
+4
-2
@@ -2,10 +2,12 @@ import argparse
2
import os.path
3
import subprocess
4
5
-EXTENSIONS = ['.c', '.cpp', '.h', '.hpp', '.idl', '.resw']
5
+EXTENSIONS = ['.c', '.cpp', '.h', '.hpp', '.idl', '.resw', '.cmake']
6
+FILENAMES = ['cmakelists.txt']
7
8
def is_source_file(path: str) -> bool:
8
- return any(path.casefold().endswith(e) for e in EXTENSIONS)
9
+ folded = path.casefold()
10
+ return os.path.basename(folded) in FILENAMES or any(folded.endswith(e) for e in EXTENSIONS)
11
12
def has_crlf_mismatch(content: bytes) -> bool:
13
# Strip all CRLF pairs, then any remaining lone '\n' or '\r' is a mismatch.