Add scenario-based tests

Modified Xunit runner to run Scenario Benchmarks
Updating xunit-performance packages

1 files changed, 18 insertions, 4 deletions

diff --git a/tests/scripts/run-xunit-perf.cmd b/tests/scripts/run-xunit-perf.cmd
index 0d657c6e9e..36456322db 100644
--- a/tests/scripts/run-xunit-perf.cmd
+++ b/tests/scripts/run-xunit-perf.cmd
@@ -12,6 +12,7 @@ set TEST_FILE_EXT=exe
 set TEST_ARCH=x64
 set TEST_ARCHITECTURE=x64
 set TEST_CONFIG=Release
+set IS_SCENARIO_TEST=0
 
 goto :ARGLOOP
 
@@ -34,7 +35,6 @@ if NOT EXIST %CORECLR_OVERLAY% (
 )
 
 @echo --- setting up sandbox
-
 if exist sandbox rd /s /q sandbox
 if exist sandbox echo ERROR: Failed to remove the sandbox folder& exit /b 1
 if not exist sandbox mkdir sandbox
@@ -94,11 +94,19 @@ if DEFINED TEST_ENV (
     )
 )
 
-corerun.exe PerfHarness.dll %CORECLR_REPO%\sandbox\%BENCHNAME%.%TEST_FILE_EXT% --perf:runid Perf > %BENCHNAME%.out
+if [%IS_SCENARIO_TEST%] == [1] (
+  corerun.exe %CORECLR_REPO%\sandbox\%BENCHNAME%.%TEST_FILE_EXT% --perf:runid Perf > %BENCHNAME%.out
+) else (
+  corerun.exe PerfHarness.dll %CORECLR_REPO%\sandbox\%BENCHNAME%.%TEST_FILE_EXT% --perf:runid Perf > %BENCHNAME%.out
+)
 
 @rem optionally generate results for benchview
 if not [%BENCHVIEW_PATH%] == [] (
-  py "%BENCHVIEW_PATH%\measurement.py" xunit "Perf-%BENCHNAME%.xml" --better desc --drop-first-value --append
+  if [%IS_SCENARIO_TEST%] == [1] (
+    py "%BENCHVIEW_PATH%\measurement.py" xunitscenario "Perf-%BENCHNAME%.xml" --better desc --drop-first-value --append
+  ) else (
+    py "%BENCHVIEW_PATH%\measurement.py" xunit "Perf-%BENCHNAME%.xml" --better desc --drop-first-value --append
+  )
   REM Save off the results to the root directory for recovery later in Jenkins
   xcopy Perf-%BENCHNAME%*.xml %CORECLR_REPO%\
   xcopy Perf-%BENCHNAME%*.etl %CORECLR_REPO%\
@@ -117,6 +125,11 @@ shift
 shift
 goto :ARGLOOP
 )
+IF /I [%1] == [-scenarioTest] (
+set IS_SCENARIO_TEST=1
+shift
+goto :ARGLOOP
+)
 IF /I [%1] == [-runtype] (
 set RUN_TYPE=%2
 shift
@@ -166,7 +179,7 @@ goto :USAGE
 goto :SETUP
 
 :USAGE
-echo run-xunit-perf.cmd -testBinLoc ^<path_to_tests^> [-library] [-arch] ^<x86^|x64^> [-configuration] ^<Release^|Debug^> [-uploadToBenchview] ^<path_to_benchview_tools^> [-runtype] ^<rolling^|private^>
+echo run-xunit-perf.cmd -testBinLoc ^<path_to_tests^> [-library] [-arch] ^<x86^|x64^> [-configuration] ^<Release^|Debug^> [-uploadToBenchview] ^<path_to_benchview_tools^> [-runtype] ^<rolling^|private^> [-scenarioTest]
 
 echo For the path to the tests you can pass a parent directory and the script will grovel for
 echo all tests in subdirectories and run them.
@@ -176,5 +189,6 @@ echo -uploadtoBenchview is used to specify a path to the Benchview tooling and w
 echo set we will upload the results of the tests to the coreclr container in benchviewupload.
 echo Runtype sets the runtype that we upload to Benchview, rolling for regular runs, and private for
 echo PRs.
+echo -scenarioTest should be included if you are running a scenario benchmark.
 
 goto :EOF