summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJosé Rivero <jorive@microsoft.com>2017-04-18 17:59:00 -0700
committerJosé Rivero <jorive@microsoft.com>2017-04-18 17:59:00 -0700
commit76785ed6f2236cd6884ab22139916c874478ef46 (patch)
tree6416e4b28a2aee401d3ff2aa04e72296a568b9d7 /tests
parentba6837895e484d80675089b3a10a1adba32a6bb4 (diff)
downloadcoreclr-76785ed6f2236cd6884ab22139916c874478ef46.tar.gz
coreclr-76785ed6f2236cd6884ab22139916c874478ef46.tar.bz2
coreclr-76785ed6f2236cd6884ab22139916c874478ef46.zip
Set default BenchView run type to local
- This is the case when running on the dev boxes (outside automation)
Diffstat (limited to 'tests')
-rw-r--r--tests/scripts/run-xunit-perf.cmd29
1 files changed, 16 insertions, 13 deletions
diff --git a/tests/scripts/run-xunit-perf.cmd b/tests/scripts/run-xunit-perf.cmd
index 26f8c88797..71511fa560 100644
--- a/tests/scripts/run-xunit-perf.cmd
+++ b/tests/scripts/run-xunit-perf.cmd
@@ -7,6 +7,7 @@
setlocal
set ERRORLEVEL=
+ set BENCHVIEW_RUN_TYPE=local
set CORECLR_REPO=%CD%
set TEST_FILE_EXT=exe
set TEST_ARCH=x64
@@ -109,7 +110,7 @@ rem ****************************************************************************
goto :parse_command_line_arguments
)
IF /I [%~1] == [-runtype] (
- set RUN_TYPE=%~2
+ set BENCHVIEW_RUN_TYPE=%~2
shift
shift
goto :parse_command_line_arguments
@@ -222,23 +223,25 @@ endlocal& exit /b %ERRORLEVEL%
rem ****************************************************************************
rem Generates BenchView's submission data and upload it
rem ****************************************************************************
- call :run_cmd py.exe "%BENCHVIEW_PATH%\submission.py" measurement.json ^
- --build ..\build.json ^
- --machine-data ..\machinedata.json ^
- --metadata ..\submission-metadata.json ^
- --group "CoreCLR" ^
- --type "%RUN_TYPE%" ^
- --config-name "%TEST_CONFIG%" ^
- --config Configuration "%TEST_CONFIG%" ^
- --config OS "Windows_NT" ^
- --arch "%TEST_ARCHITECTURE%" ^
- --machinepool "PerfSnake"
+setlocal
+ set LV_SUBMISSION_ARGS=
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --build ..\build.json
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --machine-data ..\machinedata.json
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --metadata ..\submission-metadata.json
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --group "CoreCLR"
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --type "%BENCHVIEW_RUN_TYPE%"
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config-name "%TEST_CONFIG%"
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config Configuration "%TEST_CONFIG%"
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config OS "Windows_NT"
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --arch "%TEST_ARCHITECTURE%"
+ set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --machinepool "PerfSnake"
+ call :run_cmd py.exe "%BENCHVIEW_PATH%\submission.py" measurement.json %LV_SUBMISSION_ARGS%
IF %ERRORLEVEL% NEQ 0 (
call :print_error Creating BenchView submission data failed.
exit /b 1
)
- REM FIXME: call :run_cmd py.exe "%BENCHVIEW_PATH%\upload.py" submission.json --container coreclr
+ call :run_cmd py.exe "%BENCHVIEW_PATH%\upload.py" submission.json --container coreclr
IF %ERRORLEVEL% NEQ 0 (
call :print_error Uploading to BenchView failed.
exit /b 1