Skip to content
Draft
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
77 changes: 77 additions & 0 deletions eng/testing/DesktopBatchRunner.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
@echo off
setlocal enabledelayedexpansion

set "BATCH_DIR=%CD%"
set /a SUITE_COUNT=0
set /a FAIL_COUNT=0
set "FOUND_ZIP="
set "PYTHON=%HELIX_PYTHONPATH%"
if "%PYTHON%"=="" set "PYTHON=python"

if "%HELIX_WORKITEM_UPLOAD_ROOT%"=="" (
set "ORIGINAL_UPLOAD_ROOT=%CD%\test-results"
) else (
set "ORIGINAL_UPLOAD_ROOT=%HELIX_WORKITEM_UPLOAD_ROOT%"
)

echo === DesktopBatchRunner ===
echo BATCH_DIR=%BATCH_DIR%
echo ORIGINAL_UPLOAD_ROOT=%ORIGINAL_UPLOAD_ROOT%

for %%z in ("%BATCH_DIR%\*.zip") do (
if exist "%%~fz" (
set "FOUND_ZIP=1"
set "suiteName=%%~nz"
set "suiteDir=%BATCH_DIR%\!suiteName!"
set "suiteExitCode=0"

echo.
echo ========================= BEGIN !suiteName! =============================

mkdir "!suiteDir!" >nul 2>nul
"%PYTHON%" -c "import zipfile,sys; zipfile.ZipFile(sys.argv[1]).extractall(sys.argv[2])" "%%~fz" "!suiteDir!"
if !errorlevel! neq 0 (
echo ERROR: Failed to extract %%~fz
set "suiteExitCode=1"
) else (
set "HELIX_WORKITEM_UPLOAD_ROOT=!ORIGINAL_UPLOAD_ROOT!\!suiteName!"
mkdir "!HELIX_WORKITEM_UPLOAD_ROOT!" >nul 2>nul

pushd "!suiteDir!"
call RunTests.cmd %*
set "suiteExitCode=!errorlevel!"
popd
)

rmdir /s /q "!suiteDir!" 2>nul

set /a SUITE_COUNT+=1

if !suiteExitCode! neq 0 (
set /a FAIL_COUNT+=1
echo ----- FAIL !suiteName! - exit code !suiteExitCode! -----
) else (
echo ----- PASS !suiteName! -----
)

echo ========================= END !suiteName! ===============================
)
)

set "HELIX_WORKITEM_UPLOAD_ROOT=%ORIGINAL_UPLOAD_ROOT%"

if not defined FOUND_ZIP (
echo No .zip files found in %BATCH_DIR%
exit /b 1
)

echo.
echo === Batch Summary ===
set /a PASS_COUNT=SUITE_COUNT-FAIL_COUNT
echo Total: %SUITE_COUNT% ^| Passed: %PASS_COUNT% ^| Failed: %FAIL_COUNT%

if %FAIL_COUNT% neq 0 (
exit /b 1
)

exit /b 0
110 changes: 110 additions & 0 deletions eng/testing/DesktopBatchRunner.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
#!/usr/bin/env bash

if [[ -z "${HELIX_WORKITEM_UPLOAD_ROOT:-}" ]]; then
ORIGINAL_UPLOAD_ROOT="$PWD/test-results"
else
ORIGINAL_UPLOAD_ROOT="$HELIX_WORKITEM_UPLOAD_ROOT"
fi

if [[ -n "${HELIX_PYTHONPATH:-}" ]]; then
PYTHON_CMD=("$HELIX_PYTHONPATH")
elif command -v python3 >/dev/null 2>&1; then
PYTHON_CMD=(python3)
else
PYTHON_CMD=(python)
fi

BATCH_DIR="$PWD"
SUITE_COUNT=0
FAIL_COUNT=0
SUITE_NAMES=()
SUITE_EXIT_CODES=()
SUITE_DURATIONS=()

echo "=== DesktopBatchRunner ==="
echo "BATCH_DIR=$BATCH_DIR"
echo "ORIGINAL_UPLOAD_ROOT=$ORIGINAL_UPLOAD_ROOT"

for zipFile in "$BATCH_DIR"/*.zip; do
if [[ ! -f "$zipFile" ]]; then
echo "No .zip files found in $BATCH_DIR"
exit 1
fi

suiteName=$(basename "$zipFile" .zip)
suiteDir="$BATCH_DIR/$suiteName"

echo ""
echo "========================= BEGIN $suiteName ============================="

mkdir -p "$suiteDir"
"${PYTHON_CMD[@]}" -c "import zipfile,sys; zipfile.ZipFile(sys.argv[1]).extractall(sys.argv[2])" "$zipFile" "$suiteDir"
unzipExitCode=$?
if [[ $unzipExitCode -ne 0 ]]; then
echo "ERROR: Failed to extract $zipFile (exit code: $unzipExitCode)"
FAIL_COUNT=$((FAIL_COUNT + 1))
SUITE_NAMES+=("$suiteName")
SUITE_EXIT_CODES+=("$unzipExitCode")
SUITE_DURATIONS+=("0")
SUITE_COUNT=$((SUITE_COUNT + 1))
rm -rf "$suiteDir"
continue
fi

export HELIX_WORKITEM_UPLOAD_ROOT="$ORIGINAL_UPLOAD_ROOT/$suiteName"
mkdir -p "$HELIX_WORKITEM_UPLOAD_ROOT"

pushd "$suiteDir" >/dev/null

chmod +x RunTests.sh

startTime=$(date +%s)
./RunTests.sh "$@"
suiteExitCode=$?
endTime=$(date +%s)

popd >/dev/null

rm -rf "$suiteDir"

duration=$((endTime - startTime))

SUITE_NAMES+=("$suiteName")
SUITE_EXIT_CODES+=("$suiteExitCode")
SUITE_DURATIONS+=("$duration")
SUITE_COUNT=$((SUITE_COUNT + 1))

if [[ $suiteExitCode -ne 0 ]]; then
FAIL_COUNT=$((FAIL_COUNT + 1))
echo "----- FAIL $suiteName - exit code $suiteExitCode - ${duration}s -----"
else
echo "----- PASS $suiteName - ${duration}s -----"
fi

echo "========================= END $suiteName ==============================="
done

export HELIX_WORKITEM_UPLOAD_ROOT="$ORIGINAL_UPLOAD_ROOT"

echo ""
echo "=== Batch Summary ==="
printf "%-60s %-6s %s\n" "Suite" "Status" "Duration"
printf "%-60s %-6s %s\n" "-----" "------" "--------"

for i in "${!SUITE_NAMES[@]}"; do
if [[ ${SUITE_EXIT_CODES[$i]} -eq 0 ]]; then
status="PASS"
else
status="FAIL"
fi
printf "%-60s %-6s %ss\n" "${SUITE_NAMES[$i]}" "$status" "${SUITE_DURATIONS[$i]}"
done

echo ""
echo "Total: $SUITE_COUNT | Passed: $((SUITE_COUNT - FAIL_COUNT)) | Failed: $FAIL_COUNT"

if [[ $FAIL_COUNT -ne 0 ]]; then
exit 1
fi

exit 0
4 changes: 2 additions & 2 deletions src/libraries/pretest.proj
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<ProjectReference Include="$(ToolsProjectRoot)hotreload-delta-gen\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool\Microsoft.DotNet.HotReload.Utils.Generator.BuildTool.csproj" />
<ProjectReference Include="$(ToolsProjectRoot)hotreload-delta-gen\Microsoft.DotNet.HotReload.Utils.Generator.Tasks\Microsoft.DotNet.HotReload.Utils.Generator.Tasks.csproj" />

<!-- HelixTestTasks for batched WASM library tests on Helix -->
<ProjectReference Include="$(RepoTasksDir)HelixTestTasks\HelixTestTasks.csproj" Condition="'$(TargetOS)' == 'browser'" />
<!-- HelixTestTasks for batched library tests on Helix -->
<ProjectReference Include="$(RepoTasksDir)HelixTestTasks\HelixTestTasks.csproj" Condition="'$(TargetOS)' == 'browser' or ('$(TargetOS)' != 'wasi' and '$(TargetsMobile)' != 'true' and '$(BatchLibraryHelixWorkItems)' != 'false')" />

<ProjectReference Include="$(CommonTestPath)AppleTestRunner\AppleTestRunner.csproj" Condition="'$(TargetOS)' == 'maccatalyst' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator'"/>
<ProjectReference Include="$(CommonTestPath)AndroidTestRunner\AndroidTestRunner.csproj" Condition="'$(TargetOS)' == 'android'" />
Expand Down
Loading
Loading