Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .pipelines/build-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ stages:

Move-Item -Path "bin\$arch\release\wsltests.dll" -Destination "$(ob_outputDirectory)\testbin\$arch\release\wsltests.dll"
Move-Item -Path "bin\$arch\release\testplugin.dll" -Destination "$(ob_outputDirectory)\testbin\$arch\release\testplugin.dll"
Move-Item -Path "bin\$arch\release\wslcsdk.dll" -Destination "$(ob_outputDirectory)\testbin\$arch\release\wslcsdk.dll"
Move-Item -Path "packages\Microsoft.Taef.$taefVersion\build\Binaries\$arch" -Destination "$(ob_outputDirectory)\testbin\$arch\release\taef"
}

Expand Down
4 changes: 3 additions & 1 deletion src/windows/WslcSDK/wslcsdk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,11 @@ CATCH_RETURN();

// GENERAL CONTAINER MANAGEMENT

STDAPI WslcContainerGetID(WslcContainer container, PCHAR (*containerId)[WSLC_CONTAINER_ID_LENGTH])
STDAPI WslcContainerGetID(WslcContainer container, CHAR containerId[WSLC_CONTAINER_ID_LENGTH])
try
{
static_assert(WSLC_CONTAINER_ID_LENGTH == sizeof(WSLAContainerId), "Container ID lengths differ.");

UNREFERENCED_PARAMETER(container);
UNREFERENCED_PARAMETER(containerId);
return E_NOTIMPL;
Expand Down
2 changes: 1 addition & 1 deletion src/windows/WslcSDK/wslcsdk.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ STDAPI WslcContainerRelease(_In_ WslcContainer container);

#define WSLC_CONTAINER_ID_LENGTH 65 // 64 chars + null

STDAPI WslcContainerGetID(WslcContainer container, PCHAR (*containerId)[WSLC_CONTAINER_ID_LENGTH]);
STDAPI WslcContainerGetID(WslcContainer container, CHAR containerId[WSLC_CONTAINER_ID_LENGTH]);

STDAPI WslcContainerGetInitProcess(_In_ WslcContainer container, _Out_ WslcProcess* initProcess);

Expand Down
9 changes: 6 additions & 3 deletions test/windows/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ set(SOURCES
PluginTests.cpp
PolicyTests.cpp
InstallerTests.cpp
WSLATests.cpp)
WSLATests.cpp
WslcSdkTests.cpp)

set(HEADERS
Common.h
Expand All @@ -20,21 +21,23 @@ add_compile_definitions(INLINE_TEST_METHOD_MARKUP)

add_library(wsltests SHARED ${SOURCES} ${HEADERS})

target_include_directories(wsltests PRIVATE ${CMAKE_SOURCE_DIR}/src/windows/WslcSDK)
target_link_directories(wsltests PRIVATE ${BIN})
target_precompile_headers(wsltests REUSE_FROM common)
target_link_libraries(wsltests
common
wslclib
wslcsdk
${TAEF_LINK_LIBRARIES}
${COMMON_LINK_LIBRARIES}
VirtDisk.lib
Wer.lib
Dbghelp.lib
sfc.lib)

add_dependencies(wsltests wslserviceidl wslclib wslc)
add_dependencies(wsltests wslserviceidl wslclib wslc wslcsdk)
add_subdirectory(testplugin)
add_subdirectory(wslc)

# For prettier source tree browsing
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} ${HEADERS})
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} ${HEADERS})
1 change: 1 addition & 0 deletions test/windows/WSLATests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class WSLATests
{
THROW_IF_WIN32_ERROR(WSAStartup(MAKEWORD(2, 2), &m_wsadata));

// The WSLC SDK tests use this same storage to reduce pull overhead.
m_storagePath = std::filesystem::current_path() / "test-storage";
m_defaultSessionSettings = GetDefaultSessionSettings(c_testSessionName, true, WSLANetworkingModeVirtioProxy);
m_defaultSession = CreateSession(m_defaultSessionSettings);
Expand Down
Loading