Skip to content

Commit da2726b

Browse files
committed
Hardcode CI test bitness
1 parent e9aff89 commit da2726b

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

ci/runJob.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ python --version
8282
python -m venv %WORKSPACE%\python-venv
8383
%WORKSPACE%\python-venv\Scripts\python -m pip install --no-cache-dir -r VulkanTests\requirements.txt > %WORKSPACE%\python-venv.txt 2>&1 || exit /b
8484

85-
%WORKSPACE%\python-venv\Scripts\python VulkanTests\gfxrecontest.py --compiler vs2022 --build-mode %BUILD_MODE% %WINDOWS_TEST_ARGS% --suite "ci-gfxr-suites\%GFXRECON_TRACE_SUBDIR%\%TEST_SUITE%" --trace-dir "%GFXRECON_TRACE_DIR%" --result-dir "%RESULTS_DIR%"
85+
%WORKSPACE%\python-venv\Scripts\python VulkanTests\gfxrecontest.py --compiler vs2022 --build-mode %BUILD_MODE% --bits 64 %WINDOWS_TEST_ARGS% --suite "ci-gfxr-suites\%GFXRECON_TRACE_SUBDIR%\%TEST_SUITE%" --trace-dir "%GFXRECON_TRACE_DIR%" --result-dir "%RESULTS_DIR%"

ci/runJob.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ python3 --version
6060
python3 -m venv $WORKSPACE/python-venv
6161
$WORKSPACE/python-venv/bin/python3 -m pip install --no-cache-dir -r VulkanTests/requirements.txt > $WORKSPACE/python-venv.txt 2>&1
6262

63-
$WORKSPACE/python-venv/bin/python3 VulkanTests/gfxrecontest.py --build-mode ${BUILD_MODE} $LINUX_TEST_ARGS --suite "ci-gfxr-suites/$GFXRECON_TRACE_SUBDIR/$TEST_SUITE" --trace-dir "$GFXRECON_TRACE_DIR" --result-dir "$RESULTS_DIR"
63+
$WORKSPACE/python-venv/bin/python3 VulkanTests/gfxrecontest.py --build-mode ${BUILD_MODE} --bits 64 $LINUX_TEST_ARGS --suite "ci-gfxr-suites/$GFXRECON_TRACE_SUBDIR/$TEST_SUITE" --trace-dir "$GFXRECON_TRACE_DIR" --result-dir "$RESULTS_DIR"

ci/runTest.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ echo creating Python virtual environment in %WORKSPACE%\python-venv...
2727
python -m venv "%WORKSPACE%\python-venv"
2828
"%WORKSPACE%\python-venv\Scripts\python" -m pip install --no-cache-dir -r VulkanTests\requirements.txt > "%WORKSPACE%\python-venv.txt" 2>&1 || exit /b
2929

30-
"%WORKSPACE%\python-venv\Scripts\python" VulkanTests\gfxrecontest.py --compiler vs2022 --build-mode %BUILD_MODE% %WINDOWS_TEST_ARGS% --suite "ci-gfxr-suites\%GFXRECON_TRACE_SUBDIR%\%TEST_SUITE%" --trace-dir "%GFXRECON_TRACE_DIR%" --result-dir "%RESULTS_DIR%"
30+
"%WORKSPACE%\python-venv\Scripts\python" VulkanTests\gfxrecontest.py --compiler vs2022 --build-mode %BUILD_MODE% --bits 64 %WINDOWS_TEST_ARGS% --suite "ci-gfxr-suites\%GFXRECON_TRACE_SUBDIR%\%TEST_SUITE%" --trace-dir "%GFXRECON_TRACE_DIR%" --result-dir "%RESULTS_DIR%"

ci/runTest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ echo creating Python virtual environment in $WORKSPACE/python-venv...
2626
python3 -m venv "$WORKSPACE/python-venv"
2727
"$WORKSPACE/python-venv/bin/python3" -m pip install --no-cache-dir -r VulkanTests/requirements.txt > "$WORKSPACE/python-venv.txt" 2>&1
2828

29-
"$WORKSPACE/python-venv/bin/python3" VulkanTests/gfxrecontest.py --build-mode ${BUILD_MODE} $LINUX_TEST_ARGS --suite "ci-gfxr-suites/$GFXRECON_TRACE_SUBDIR/$TEST_SUITE" --trace-dir "$GFXRECON_TRACE_DIR" --result-dir "$RESULTS_DIR"
29+
"$WORKSPACE/python-venv/bin/python3" VulkanTests/gfxrecontest.py --build-mode ${BUILD_MODE} --bits 64 $LINUX_TEST_ARGS --suite "ci-gfxr-suites/$GFXRECON_TRACE_SUBDIR/$TEST_SUITE" --trace-dir "$GFXRECON_TRACE_DIR" --result-dir "$RESULTS_DIR"

0 commit comments

Comments
 (0)