From 489ffcdd6d87cd6d10a7cc6f7584e9d4951d6352 Mon Sep 17 00:00:00 2001
From: Egor Bogatov <egorbo@gmail.com>
Date: Tue, 25 Feb 2020 03:01:36 +0300
Subject: [PATCH] Remove --buildXUnitWrappers from runtest.cmd/runtest.sh
 (#31798)

---
 src/coreclr/tests/runtest.cmd |  6 ------
 src/coreclr/tests/runtest.sh  | 12 ------------
 2 files changed, 18 deletions(-)

diff --git a/src/coreclr/tests/runtest.cmd b/src/coreclr/tests/runtest.cmd
index 7509110..85f0e4a 100644
--- a/src/coreclr/tests/runtest.cmd
+++ b/src/coreclr/tests/runtest.cmd
@@ -30,7 +30,6 @@ set __JitDisasm=
 set __IlasmRoundTrip=
 set __DoCrossgen=
 set __CrossgenAltJit=
-set __BuildXUnitWrappers=
 set __PrintLastResultsOnly=
 set RunInUnloadableContext=
 
@@ -70,7 +69,6 @@ if /i "%1" == "jitforcerelocs"                          (set COMPlus_ForceRelocs
 if /i "%1" == "jitdisasm"                               (set __JitDisasm=1&shift&goto Arg_Loop)
 if /i "%1" == "ilasmroundtrip"                          (set __IlasmRoundTrip=1&shift&goto Arg_Loop)
 
-if /i "%1" == "buildxunitwrappers"                      (set __BuildXunitWrappers=1&shift&goto Arg_Loop)
 if /i "%1" == "printlastresultsonly"                    (set __PrintLastResultsOnly=1&shift&goto Arg_Loop)
 if /i "%1" == "runcrossgentests"                        (set RunCrossGen=true&shift&goto Arg_Loop)
 if /i "%1" == "runcrossgen2tests"                       (set RunCrossGen2=true&shift&goto Arg_Loop)
@@ -151,10 +149,6 @@ if defined __Sequential (
     set __RuntestPyArgs=%__RuntestPyArgs% --sequential
 )
 
-if defined __BuildXUnitWrappers (
-    set __RuntestPyArgs=%__RuntestPyArgs% --build_xunit_test_wrappers
-)
-
 if defined RunCrossGen (
     set __RuntestPyArgs=%__RuntestPyArgs% --run_crossgen_tests
 )
diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh
index 737de85..95437d4 100755
--- a/src/coreclr/tests/runtest.sh
+++ b/src/coreclr/tests/runtest.sh
@@ -39,7 +39,6 @@ function print_usage {
     echo '  --tieredcompilation              : Runs the tests with COMPlus_TieredCompilation=1'
     echo '  --link <ILlink>                  : Runs the tests after linking via ILlink'
     echo '  --xunitOutputPath=<path>         : Create xUnit XML report at the specifed path (default: <test root>/coreclrtests.xml)'
-    echo '  --buildXUnitWrappers             : Force creating the xunit wrappers, this is useful if there have been changes to issues.targets'
     echo '  --printLastResultsOnly           : Print the results of the last run'
     echo '  --runincontext                   : Run each tests in an unloadable AssemblyLoadContext'
     echo ''
@@ -218,7 +217,6 @@ verbose=0
 doCrossgen=0
 jitdisasm=0
 ilasmroundtrip=
-buildXUnitWrappers=
 printLastResultsOnly=
 runSequential=0
 runincontext=0
@@ -254,9 +252,6 @@ do
         release|Release)
             buildConfiguration="Release"
             ;;
-        --buildXUnitWrappers)
-            buildXUnitWrappers=1
-            ;;
         --printLastResultsOnly)
             printLastResultsOnly=1
             ;;
@@ -504,13 +499,6 @@ if [ ! -z "$ilasmroundtrip" ]; then
     runtestPyArguments+=("--ilasmroundtrip")
 fi
 
-if [ ! -z "$buildXUnitWrappers" ]; then
-    runtestPyArguments+=("--build_xunit_test_wrappers")
-else
-    echo "Skipping xunit wrapper build. If build-test was called on a different"
-    echo "host_os or arch the test run will most likely have failures."
-fi
-
 if (($verbose!=0)); then
     runtestPyArguments+=("--verbose")
 fi
-- 
2.7.4