test: Add arm64 test distro support (#14500)
* test: Add arm64 test distro support * update unit test baseline * more test baseline updates --------- Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
Ben Hillis committed
Mar 23, 2026 at 11:20 UTC
dd88ff737c1f05cbfda5ff4286e000d53d6aafd2
10 files changed
+68
-60
.pipelines/build-stage.yml
+6
-4
@@ -382,24 +382,26 @@ stages:
382
- powershell: |
383
$taefVersion = (Select-Xml -Path packages.config -XPath '/packages/package[@id=''Microsoft.Taef'']/@version').Node.Value
384
New-Item -ItemType Directory -Path "$(ob_outputDirectory)\bundle" -Force
385
- foreach ($arch in @("x64", "ARM64"))
385
+ # TODO: Add "ARM64" to this list once arm64 testing is supported
386
+ foreach ($arch in @("x64"))
387
{
388
mkdir $(ob_outputDirectory)\testbin\$arch\release
389
390
Move-Item -Path "bin\$arch\release\wsltests.dll" -Destination "$(ob_outputDirectory)\testbin\$arch\release\wsltests.dll"
391
Move-Item -Path "bin\$arch\release\testplugin.dll" -Destination "$(ob_outputDirectory)\testbin\$arch\release\testplugin.dll"
392
Move-Item -Path "packages\Microsoft.Taef.$taefVersion\build\Binaries\$arch" -Destination "$(ob_outputDirectory)\testbin\$arch\release\taef"
393
+ Move-Item -Path "bin\$arch\cloudtest" -Destination "$(ob_outputDirectory)\testbin\$arch\cloudtest"
394
+
395
+ $TestDistroVersion = (Select-Xml -Path packages.config -XPath '/packages/package[@id=''Microsoft.WSL.TestDistro'']/@version').Node.Value
396
+ Copy-Item "packages\Microsoft.WSL.TestDistro.$TestDistroVersion\$arch\test_distro.tar.xz" "$(ob_outputDirectory)\testbin\$arch"
397
}
398
394
- Move-Item -Path "bin\x64\cloudtest" -Destination "$(ob_outputDirectory)\testbin\x64\cloudtest"
399
Move-Item -Path "tools\test\test-setup.ps1" -Destination "$(ob_outputDirectory)\testbin\test-setup.ps1"
400
Move-Item -Path "tools\test\CloudTest-Setup.bat" -Destination "$(ob_outputDirectory)\testbin\CloudTest-Setup.bat"
401
Move-Item -Path "diagnostics\wsl.wprp" -Destination "$(ob_outputDirectory)\testbin\wsl.wprp"
402
Move-Item -Path "test\linux\unit_tests" -Destination "$(ob_outputDirectory)\testbin\unit_tests"
403
404
Move-Item -Path bundle\release\* -Destination $(ob_outputDirectory)\bundle
401
- $TestDistroVersion = (Select-Xml -Path packages.config -XPath '/packages/package[@id=''Microsoft.WSL.TestDistro'']/@version').Node.Value
402
- Copy-Item "packages\Microsoft.WSL.TestDistro.$TestDistroVersion\test_distro.tar.xz" "$(ob_outputDirectory)\testbin\x64"
405
406
displayName: Move artifacts to drop directory
407
CMakeLists.txt
-2
@@ -16,10 +16,8 @@ endif()
16
17
if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "arm64" OR "${TARGET_PLATFORM}" STREQUAL "arm64")
18
set(TARGET_PLATFORM "arm64")
19
- set(TEST_DISTRO_PLATFORM "arm64")
19
elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64|amd64" OR "${TARGET_PLATFORM}" MATCHES "x64|amd64")
20
set(TARGET_PLATFORM "x64")
22
- set(TEST_DISTRO_PLATFORM "amd64")
21
else()
22
message(FATAL_ERROR "Unsupported platform: ${CMAKE_GENERATOR_PLATFORM}")
23
endif()
packages.config
+1
-1
@@ -21,7 +21,7 @@
21
<package id="Microsoft.WSL.DeviceHost" version="1.1.39-0" />
22
<package id="Microsoft.WSL.Kernel" version="6.6.114.1-1" targetFramework="native" />
23
<package id="Microsoft.WSL.LinuxSdk" version="1.20.0" targetFramework="native" />
24
- <package id="Microsoft.WSL.TestDistro" version="2.5.7-47" />
24
+ <package id="Microsoft.WSL.TestDistro" version="2.7.1-1" />
25
<package id="Microsoft.WSLg" version="1.0.73" />
26
<package id="Microsoft.Xaml.Behaviors.WinUI.Managed" version="3.0.0" />
27
<package id="vswhere" version="3.1.7" />
test/windows/PluginTests.cpp
+36
-36
@@ -159,8 +159,8 @@ class PluginTests
159
VM created (settings->CustomConfigurationFlags=0)
160
Folder mounted (* -> /test-plugin)
161
Process created
162
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
163
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
162
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
163
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
164
VM Stopping)";
165
166
ConfigurePlugin(PluginTestType::Success);
@@ -182,8 +182,8 @@ class PluginTests
182
VM created (settings->CustomConfigurationFlags=0)
183
Folder mounted (* -> /test-plugin)
184
Process created
185
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
186
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
185
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
186
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
187
VM Stopping)";
188
189
ConfigurePlugin(PluginTestType::Success);
@@ -200,8 +200,8 @@ class PluginTests
200
VM created (settings->CustomConfigurationFlags=0)
201
Folder mounted (* -> /test-plugin)
202
Process created
203
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
204
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
203
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
204
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
205
VM Stopping)";
206
207
ConfigurePlugin(PluginTestType::Success);
@@ -259,8 +259,8 @@ class PluginTests
259
VM created (settings->CustomConfigurationFlags=2)
260
Folder mounted (* -> /test-plugin)
261
Process created
262
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
263
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
262
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
263
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
264
VM Stopping)";
265
266
WslConfigChange config(LxssGenerateTestConfig({.vmIdleTimeout = 1, .kernelCommandLine = L"custom"}));
@@ -277,13 +277,13 @@ class PluginTests
277
constexpr auto ExpectedOutput =
278
LR"(Plugin loaded. TestMode=10
279
VM created (settings->CustomConfigurationFlags=0)
280
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
281
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
280
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
281
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
282
VM Stopping
283
VM created (settings->CustomConfigurationFlags=0)
284
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
284
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
285
OnDistroStarted: received same GUID
286
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
286
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
287
VM Stopping)";
288
289
ConfigurePlugin(PluginTestType::SameDistroId);
@@ -301,11 +301,11 @@ class PluginTests
301
constexpr auto ExpectedOutput =
302
LR"(Plugin loaded. TestMode=14
303
VM created (settings->CustomConfigurationFlags=0)
304
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
304
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
305
Distribution Stopping, name=test_distro, package=, PidNs=*
306
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
306
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
307
Init's pid is different (* ! = *)
308
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
308
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
309
VM Stopping)";
310
311
ConfigurePlugin(PluginTestType::InitPidIsDifferent);
@@ -341,8 +341,8 @@ class PluginTests
341
LR"(Plugin loaded. TestMode=7
342
VM created (settings->CustomConfigurationFlags=0)
343
API error tests passed
344
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
345
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
344
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
345
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
346
VM Stopping)";
347
348
ConfigurePlugin(PluginTestType::ApiErrors);
@@ -442,8 +442,8 @@ class PluginTests
442
constexpr auto ExpectedOutput =
443
LR"(Plugin loaded. TestMode=5
444
VM created (settings->CustomConfigurationFlags=0)
445
- Distribution started, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
446
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
445
+ Distribution started, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
446
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
447
VM Stopping
448
OnVmStopping: E_UNEXPECTED)";
449
@@ -459,7 +459,7 @@ class PluginTests
459
constexpr auto ExpectedOutput =
460
LR"(Plugin loaded. TestMode=4
461
VM created (settings->CustomConfigurationFlags=0)
462
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
462
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
463
OnDistroStarted: E_UNEXPECTED
464
VM Stopping)";
465
@@ -479,8 +479,8 @@ class PluginTests
479
constexpr auto ExpectedOutput =
480
LR"(Plugin loaded. TestMode=6
481
VM created (settings->CustomConfigurationFlags=0)
482
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
483
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
482
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
483
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
484
OnDistroStopping: E_UNEXPECTED
485
VM Stopping)";
486
@@ -515,7 +515,7 @@ class PluginTests
515
constexpr auto ExpectedOutput =
516
LR"(Plugin loaded. TestMode=12
517
VM created (settings->CustomConfigurationFlags=0)
518
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
518
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
519
OnDistroStarted: E_FAIL
520
VM Stopping)";
521
@@ -543,8 +543,8 @@ class PluginTests
543
VM created (settings->CustomConfigurationFlags=0)
544
Folder mounted (* -> /test-plugin)
545
Process created
546
- Distribution registered, name=plugin-test-distro, package=, Flavor=debian, Version=12
547
- Distribution unregistered, name=plugin-test-distro, package=, Flavor=debian, Version=12
546
+ Distribution registered, name=plugin-test-distro, package=, Flavor=debian, Version=13
547
+ Distribution unregistered, name=plugin-test-distro, package=, Flavor=debian, Version=13
548
VM Stopping)";
549
550
ValidateLogFile(ExpectedOutput);
@@ -568,14 +568,14 @@ class PluginTests
568
VM created (settings->CustomConfigurationFlags=0)
569
Folder mounted (* -> /test-plugin)
570
Process created
571
- Distribution registered, name=plugin-test-distro, package=, Flavor=debian, Version=12
571
+ Distribution registered, name=plugin-test-distro, package=, Flavor=debian, Version=13
572
VM Stopping
573
- Distribution unregistered, name=plugin-test-distro, package=, Flavor=debian, Version=12
573
+ Distribution unregistered, name=plugin-test-distro, package=, Flavor=debian, Version=13
574
VM created (settings->CustomConfigurationFlags=0)
575
Folder mounted (* -> /test-plugin)
576
Process created
577
- Distribution registered, name=plugin-test-distro-vhd, package=, Flavor=debian, Version=12
578
- Distribution unregistered, name=plugin-test-distro-vhd, package=, Flavor=debian, Version=12
577
+ Distribution registered, name=plugin-test-distro-vhd, package=, Flavor=debian, Version=13
578
+ Distribution unregistered, name=plugin-test-distro-vhd, package=, Flavor=debian, Version=13
579
VM Stopping)";
580
581
ValidateLogFile(ExpectedOutput);
@@ -593,9 +593,9 @@ class PluginTests
593
constexpr auto ExpectedOutput =
594
LR"(Plugin loaded. TestMode=15
595
VM created (settings->CustomConfigurationFlags=0)
596
- Distribution registered, name=plugin-test-distro, package=, Flavor=debian, Version=12
596
+ Distribution registered, name=plugin-test-distro, package=, Flavor=debian, Version=13
597
OnDistributionRegistered: E_UNEXPECTED
598
- Distribution unregistered, name=plugin-test-distro, package=, Flavor=debian, Version=12
598
+ Distribution unregistered, name=plugin-test-distro, package=, Flavor=debian, Version=13
599
OnDistributionUnregistered: E_UNEXPECTED
600
VM Stopping)";
601
@@ -611,11 +611,11 @@ class PluginTests
611
constexpr auto ExpectedOutput =
612
LR"(Plugin loaded. TestMode=16
613
VM created (settings->CustomConfigurationFlags=0)
614
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
614
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
615
Process created
616
Failed process launch returned: -2147467259
617
Invalid distro launch returned: -2147220717
618
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
618
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
619
VM Stopping)";
620
621
StartWsl(0);
@@ -632,8 +632,8 @@ class PluginTests
632
LR"(Plugin loaded. TestMode=17
633
VM created (settings->CustomConfigurationFlags=0)
634
Username: *
635
- Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=12
636
- Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=12
635
+ Distribution started, name=test_distro, package=, PidNs=*, InitPid=*, Flavor=debian, Version=13
636
+ Distribution Stopping, name=test_distro, package=, PidNs=*, Flavor=debian, Version=13
637
VM Stopping)";
638
639
StartWsl(0);
@@ -666,4 +666,4 @@ class PluginTests
666
L"A fatal error was returned by plugin 'TestPlugin'\r\nError code: "
667
L"Wsl/Service/CreateInstance/CreateVm/Plugin/TRUST_E_NOSIGNATURE\r\n");
668
}
669
-};
\ No newline at end of file
669
+};
test/windows/UnitTests.cpp
+6
-7
@@ -355,7 +355,7 @@ class UnitTests
355
WSL2_TEST_ONLY();
356
357
// Override WSL's binfmt interpreter
358
- VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"echo ':WSLInterop:M::MZ::/bin/echo:PF' > /usr/lib/binfmt.d/dummy.conf"), 0L);
358
+ VERIFY_ARE_EQUAL(LxsstuLaunchWsl(L"mkdir -p /usr/lib/binfmt.d && echo ':WSLInterop:M::MZ::/bin/echo:PF' > /usr/lib/binfmt.d/dummy.conf"), 0L);
359
360
auto cleanupBinfmt = wil::scope_exit_log(WI_DIAGNOSTICS_INFO, []() {
361
LxsstuLaunchWsl(L"rm /usr/lib/binfmt.d/dummy.conf");
@@ -3807,7 +3807,7 @@ localhostForwarding=true
3807
validateUidChange(L"root", 0, L"The operation completed successfully. \r\n", L"", 0);
3808
3809
const std::wstring invalidUser = L"Nonexistent";
3810
- validateUidChange(invalidUser, 0, L"", L"/usr/bin/id: \u2018" + invalidUser + L"\u2019: no such user\n", 1);
3810
+ validateUidChange(invalidUser, 0, L"", L"id: \u2018" + invalidUser + L"\u2019: no such user\n", 1);
3811
3812
auto [out, _] = LxsstuLaunchWslAndCaptureOutput(L"--manage nonexistent --set-default-user root", -1);
3813
@@ -3931,7 +3931,7 @@ localhostForwarding=true
3931
VERIFY_ARE_EQUAL(ExpectedVersion, version);
3932
};
3933
3934
- validateFlavorVersion(LXSS_DISTRO_NAME_TEST_L, L"debian", L"12");
3934
+ validateFlavorVersion(LXSS_DISTRO_NAME_TEST_L, L"debian", L"13");
3935
3936
constexpr auto testTar = L"exported-distro.tar";
3937
constexpr auto tmpDistroName = L"tmpdistro";
@@ -4031,10 +4031,10 @@ VERSION_ID="Invalid|Format"
4031
// Verify that importing a distribution with an os-release as then converting works as well
4032
VERIFY_ARE_EQUAL(
4033
LxsstuLaunchWsl(std::format(L"--import {} . {} --version {}", tmpDistroName, g_testDistroPath, convertVersion).c_str()), 0L);
4034
- validateFlavorVersion(tmpDistroName, L"debian", L"12");
4034
+ validateFlavorVersion(tmpDistroName, L"debian", L"13");
4035
4036
VERIFY_ARE_EQUAL(LxsstuLaunchWsl(std::format(L"--set-version {} {}", tmpDistroName, currentVersion).c_str()), 0L);
4037
- validateFlavorVersion(tmpDistroName, L"debian", L"12");
4037
+ validateFlavorVersion(tmpDistroName, L"debian", L"13");
4038
}
4039
4040
TEST_METHOD(DistributionId)
@@ -6410,8 +6410,7 @@ Error code: Wsl/InstallDistro/WSL_E_INVALID_JSON\r\n",
6410
// See https://github.com/microsoft/WSL/issues/13173.
6411
TEST_METHOD(SetSidNoWarning)
6412
{
6413
- auto [out, err] =
6414
- LxsstuLaunchWslAndCaptureOutput(L"socat - 'EXEC:setsid --wait cmd.exe /c echo OK',pty,setsid,ctty,stderr");
6413
+ auto [out, err] = LxsstuLaunchWslAndCaptureOutput(L"socat - 'EXEC:setsid --wait cmd.exe /c echo OK',pty,setsid,stderr");
6414
6415
VERIFY_ARE_EQUAL(out, L"OK\r\r\n");
6416
VERIFY_ARE_EQUAL(err, L"");
test/windows/testplugin/Plugin.cpp
+1
-1
@@ -261,7 +261,7 @@ HRESULT OnDistroStarted(const WSLSessionInformation* Session, const WSLDistribut
261
262
// Validate that the process actually ran inside the distro.
263
auto output = ReadFromSocket(socket.get());
264
- const auto expected = "Debian GNU/Linux 12\n";
264
+ const auto expected = "Debian GNU/Linux 13\n";
265
if (std::string(output.begin(), output.end()) != expected)
266
{
267
g_logfile << "Got unexpected output from bash: " << std::string(output.begin(), output.end())
tools/test/Microsoft.WSL.TestDistro.nuspec
+3
-2
@@ -8,6 +8,7 @@
8
<description>WSL Test distribution</description>
9
</metadata>
10
<files>
11
- <file src="test_distro.tar.xz" target="test_distro.tar.xz"/>
11
+ <file src="x64\test_distro.tar.xz" target="x64"/>
12
+ <file src="arm64\test_distro.tar.xz" target="arm64"/>
13
</files>
13
-</package>
\ No newline at end of file
14
+</package>
tools/test/build-test-distro.ps1
+13
-5
@@ -8,7 +8,7 @@
8
#>
9
10
[CmdletBinding()]
11
-Param ($Base)
11
+Param ($Base, [string]$Platform)
12
13
$ErrorActionPreference = "Stop"
14
Set-StrictMode -Version Latest
@@ -32,10 +32,18 @@ function RunInDistro {
32
}
33
}
34
35
+if ([string]::IsNullOrEmpty($Platform)) {
36
+ if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") {
37
+ $Platform = "arm64"
38
+ } else {
39
+ $Platform = "x64"
40
+ }
41
+}
42
+
43
$git_version = (git describe --tags).split('-')
44
$version = "$($git_version[0])-$($git_version[1])"
45
38
-echo "Building test_distro version: $version"
46
+echo "Building test_distro version: $version for $Platform"
47
48
Run { wsl.exe --install $Base --name test_distro --version 2 --no-launch }
49
@@ -50,7 +58,7 @@ RunInDistro("rm -rf /etc/wsl-distribution.conf /etc/wsl.conf /usr/share/doc/* /v
58
RunInDistro('rm -rf -- $(ls /usr/share/locale ^| grep -vE "en|locale.alias")')
59
RunInDistro("rm /usr/lib/systemd/user/{systemd-tmpfiles-setup.service,systemd-tmpfiles-clean.timer,systemd-tmpfiles-clean.service}")
60
RunInDistro("rm /usr/lib/systemd/system/{systemd-tmpfiles-setup-dev.service,systemd-tmpfiles-setup.service,systemd-tmpfiles-clean.timer,systemd-tmpfiles-clean.service} /lib/systemd/system/{kmod-static-nodes.service,kmod.service,sysinit.target.wants/kmod-static-nodes.service}")
53
-Run { wsl.exe --export test_distro "test_distro.tar" }
54
-Run { wsl.exe xz -e9 "test_distro.tar" }
61
+New-Item -ItemType Directory -Path $Platform -Force
62
+Run { wsl.exe --export --format tar.xz test_distro "$Platform\test_distro.tar.xz" }
63
56
-& "$PSScriptRoot/../../_deps/nuget.exe" pack Microsoft.WSL.TestDistro.nuspec -Properties version=$version
\ No newline at end of file
64
+& "$PSScriptRoot/../../_deps/nuget.exe" pack Microsoft.WSL.TestDistro.nuspec -Properties version=$version
tools/test/setup-vm-for-tests.ps1
+1
-1
@@ -95,7 +95,7 @@ $Platform = switch ($Arch) {
95
96
if ([string]::IsNullOrEmpty($TestDistroPath)) {
97
$TestDistroVersion = (Select-Xml -Path "$PSScriptRoot\..\..\packages.config" -XPath '/packages/package[@id=''Microsoft.WSL.TestDistro'']/@version').Node.Value
98
- $TestDistroPath = "$PSScriptRoot\..\..\packages\Microsoft.WSL.TestDistro.$TestDistroVersion\test_distro.tar.xz"
98
+ $TestDistroPath = "$PSScriptRoot\..\..\packages\Microsoft.WSL.TestDistro.$TestDistroVersion\$Platform\test_distro.tar.xz"
99
}
100
101
if ([string]::IsNullOrEmpty($ArtifactFolder)) {
tools/test/test.bat.in
+1
-1
@@ -6,7 +6,7 @@ set "Bin=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\${CMAKE_BUILD_TYPE}"
6
set "Tools=${CMAKE_CURRENT_LIST_DIR}\tools"
7
path %PATH%;${TAEF_SOURCE_DIR}\build\Binaries\${TARGET_PLATFORM}
8
9
-powershell.exe -ExecutionPolicy Bypass "%tools%\test\run-tests.ps1" -SetupScript "%tools%\test\test-setup.ps1" -DistroPath "${TEST_DISTRO_SOURCE_DIR}test_distro.tar.xz" -TestDllPath "%bin%\wsltests.dll" -UnitTestsPath "${CMAKE_CURRENT_LIST_DIR}\test\linux\unit_tests" -Package "%bin%\installer.msix" %* || goto fail
9
+powershell.exe -ExecutionPolicy Bypass "%tools%\test\run-tests.ps1" -SetupScript "%tools%\test\test-setup.ps1" -DistroPath "${TEST_DISTRO_SOURCE_DIR}${TARGET_PLATFORM}\test_distro.tar.xz" -TestDllPath "%bin%\wsltests.dll" -UnitTestsPath "${CMAKE_CURRENT_LIST_DIR}\test\linux\unit_tests" -Package "%bin%\installer.msix" %* || goto fail
10
11
exit /b 0
12