Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 6b0f893

Browse files
A-AndA-And
committed
Cleanup
1 parent 6ebf1fe commit 6b0f893

File tree

10 files changed

+65
-2429
lines changed

10 files changed

+65
-2429
lines changed

‎build-test.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ set __BuildLogRootName=Tests_GenerateRuntimeLayout
249249
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
250250
set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn
251251
set __BuildErr=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.err
252-
set __msbuildLog=/flp:Verbosity=diag;LogFile="%__BuildLog%"
252+
set __msbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%"
253253
set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
254254
set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
255255

@@ -379,7 +379,7 @@ set __BuildLogRootName=Tests_Overlay_Managed
379379
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
380380
set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn
381381
set __BuildErr=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.err
382-
set __msbuildLog=/flp:Verbosity=diag;LogFile="%__BuildLog%"
382+
set __msbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%"
383383
set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
384384
set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
385385

@@ -391,14 +391,14 @@ if errorlevel 1 (
391391
echo %__BuildErr%
392392
exit /b 1
393393
)
394-
xcopy /s /y "%CORE_ROOT_STAGE%" "%CORE_ROOT%"
395394

395+
xcopy /s /y "%CORE_ROOT_STAGE%" "%CORE_ROOT%"
396396

397397
set __BuildLogRootName=Tests_CoreFX_Testhost
398398
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
399399
set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn
400400
set __BuildErr=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.err
401-
set __msbuildLog=/flp:Verbosity=diag;LogFile="%__BuildLog%"
401+
set __msbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%"
402402
set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
403403
set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
404404

‎dependencies.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<Project ToolsVersion="12.0" DefaultTargets="Build"
2-
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
32

43
<!-- NuGet package restore sources. -->
54
<PropertyGroup>
@@ -176,6 +175,7 @@
176175
</ItemGroup>
177176

178177
<!-- Override isolated build dependency versions with versions from Repo API. -->
179-
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
178+
<Import Project="$(DotNetPackageVersionPropsPath)"
179+
Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
180180

181181
</Project>

‎netci.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2215,7 +2215,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR
22152215
def workspaceRelativeFxRoot = "_/fx"
22162216
def absoluteFxRoot = "%WORKSPACE%\\_\\fx"
22172217
def fxBranch = getFxBranch(branch)
2218-
// Add script to run downloaded tests here
2218+
22192219
buildCommands += "python -u %WORKSPACE%\\tests\\scripts\\run-corefx-tests.py -arch ${arch} -ci_arch ${architecture} -build_type ${configuration} -fx_root ${absoluteFxRoot} -fx_branch ${fxBranch} -env_script ${envScriptPath}"
22202220

22212221
// Archive and process (only) the test results

‎tests/CoreFX/TopN.CoreFX.Unix.issues.json

Lines changed: 33 additions & 445 deletions
Large diffs are not rendered by default.

‎tests/CoreFX/TopN.CoreFX.Windows.issues.json

Lines changed: 5 additions & 1913 deletions
Large diffs are not rendered by default.

‎tests/build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<Error Text="BuildOS has not been specified. Please do that then run build again." Condition="'$(BuildOS)' == 'AnyOS'" />
4040
<MSBuild Projects="$(MSBuildThisFileDirectory)\src\Common\external\external.depproj" />
4141
</Target>
42-
42+
4343
<Target Name="BatchRestorePackages" Condition="$(__SkipPackageRestore) != 'true'">
4444
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." />
4545

‎tests/runtest.cmd

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ if /i "%1" == "ilasmroundtrip" (set __IlasmRoundTrip=1&shift&goto Arg_Loo
8080
if /i "%1" == "GenerateLayoutOnly" (set __GenerateLayoutOnly=1&shift&goto Arg_Loop)
8181
if /i "%1" == "PerfTests" (set __PerfTests=true&shift&goto Arg_Loop)
8282
if /i "%1" == "CoreFXTests" (set __CoreFXTests=true&shift&goto Arg_Loop)
83-
if /i "%1" == "CoreFXTestList" (set __CoreFXTests=true&set _CoreFXTestList=%2&shift&shift&goto Arg_Loop)
83+
if /i "%1" == "CoreFXTestList" (set __CoreFXTests=true&set __CoreFXTestList=%2&shift&shift&goto Arg_Loop)
8484
if /i "%1" == "runcrossgentests" (set RunCrossGen=true&shift&goto Arg_Loop)
8585
if /i "%1" == "link" (set DoLink=true&set ILLINK=%2&shift&shift&goto Arg_Loop)
8686
if /i "%1" == "tieredcompilation" (set COMPLUS_TieredCompilation=1&shift&goto Arg_Loop)
@@ -108,17 +108,12 @@ shift
108108
:: Done with argument processing. Check argument values for validity.
109109

110110
if defined __TestEnv (if not exist %__TestEnv% echo %__MsgPrefix%Error: Test Environment script %__TestEnv% not found && exit /b 1)
111-
if "%__PerfTests%"=="true" (
112-
if defined __GenerateLayoutOnly echo %__MsgPrefix%Error: Don't specify both "PerfTests" and "GenerateLayoutOnly" && exit /b 1
113-
)
114-
115-
if "%__CoreFXTests%"=="true" (
116-
if defined __GenerateLayoutOnly echo %__MsgPrefix%Error: Don't specify both "CoreFXTests" and "GenerateLayoutOnly" && exit /b 1
117-
)
111+
if "%__PerfTests%"=="true" (if defined __GenerateLayoutOnly echo %__MsgPrefix%Error: Don't specify both "PerfTests" and "GenerateLayoutOnly" && exit /b 1)
112+
if "%__CoreFXTests%"=="true" (if defined __GenerateLayoutOnly echo %__MsgPrefix%Error: Don't specify both "CoreFXTests" and "GenerateLayoutOnly" && exit /b 1)
118113

119-
if defined _CoreFXTestList (
120-
if not exist %_CoreFXTestList% (
121-
echo Couldn't find CoreFX test list %_CoreFXTestList%
114+
if defined __CoreFXTestList (
115+
if not exist "%__CoreFXTestList%" (
116+
echo %__MsgPrefix%Error: Couldn't find CoreFX Test List "%__CoreFXTestList%".
122117
exit /b 1
123118
)
124119
)
@@ -259,7 +254,7 @@ if "%__CollectDumps%"=="true" (
259254
mkdir "!__CrashDumpFolder!"
260255
)
261256

262-
:: Grab the current time befo\re execution begins. This will be used to determine which crash dumps
257+
:: Grab the current time before execution begins. This will be used to determine which crash dumps
263258
:: will be uploaded.
264259
for /f "delims=" %%a in ('python !__DumplingHelperPath! get_timestamp') do @set __StartTime=%%a
265260
)
@@ -303,7 +298,6 @@ if errorlevel 1 (
303298
)
304299
goto TestsDone
305300

306-
307301
REM =========================================================================================
308302
REM ===
309303
REM === Run CoreFX tests
@@ -333,22 +327,18 @@ if defined __GenerateTestHostOnly (
333327
if not exist %_CoreFXTestHost%\dotnet.exe echo CoreFX test host not found, please run runtest.cmd again && exit /b 1
334328

335329
set /p _CoreFXTestRemoteURL=< "%__ProjectFilesDir%\CoreFX\CoreFXTestListURL.txt"
336-
if not defined _CoreFXTestList ( set _CoreFXTestList=%__ProjectFilesDir%\CoreFX\TopN.CoreFX.Windows.issues.json )
337-
if not exist %_CoreFXTestList% (
338-
echo Couldn't find CoreFX test list %_CoreFXTestList%
339-
exit /b 1
340-
)
330+
if not defined __CoreFXTestList ( set __CoreFXTestList=%__ProjectFilesDir%\CoreFX\TopN.CoreFX.Windows.issues.json )
341331

342332
echo Downloading CoreFX Test Binaries
343-
echo "%_dotnet%" "%_CoreFXTestUtilitiesOutputPath%\%_CoreFXTestSetupUtilityName%.dll" --clean --outputDirectory "%_CoreFXTestBinariesPath%" --testListJsonPath "%_CoreFXTestList%" --testUrl "%_CoreFXTestRemoteURL%"
344-
call "%_dotnet%" "%_CoreFXTestUtilitiesOutputPath%\%_CoreFXTestSetupUtilityName%.dll" --clean --outputDirectory "%_CoreFXTestBinariesPath%" --testListJsonPath "%_CoreFXTestList%" --testUrl "%_CoreFXTestRemoteURL%"
333+
echo "%_dotnet%" "%_CoreFXTestUtilitiesOutputPath%\%_CoreFXTestSetupUtilityName%.dll" --clean --outputDirectory "%_CoreFXTestBinariesPath%" --testListJsonPath "%__CoreFXTestList%" --testUrl "%_CoreFXTestRemoteURL%"
334+
call "%_dotnet%" "%_CoreFXTestUtilitiesOutputPath%\%_CoreFXTestSetupUtilityName%.dll" --clean --outputDirectory "%_CoreFXTestBinariesPath%" --testListJsonPath "%__CoreFXTestList%" --testUrl "%_CoreFXTestRemoteURL%"
345335
if errorlevel 1 (
346336
exit /b 1
347337
)
348338

349339
set _CoreFXTestExecutable=xunit.console.netcore.exe
350340

351-
REM Set the log file name to something Jenkins can understand
341+
REM Set the log file name to something Jenkins can understand
352342
set _CoreFX_TestLogFileName=testResults.xml
353343
for /D %%i in ("%_CoreFXTestBinariesPath%\*") do (
354344
if not exist "%%i\%_CoreFXTestExecutable%" echo "Error running CoreFX tests - %_CoreFXTestExecutable% not found" && exit /b 1
@@ -357,12 +347,11 @@ for /D %%i in ("%_CoreFXTestBinariesPath%\*") do (
357347
set _LogPath=%_CoreFXLogsDir%\!_TestName!
358348
if not exist "!_LogPath!" (mkdir "!_LogPath!")
359349

360-
echo Running !_TestName!
361-
echo Writing logs to !_LogPath!
362-
echo To reproduce directly run:
350+
echo %__MsgPrefix%Running !_TestName!
351+
echo Writing logs to !_LogPath!
352+
echo To reproduce directly run:
363353
echo "%_CoreFXTestHost%\dotnet.exe" "%%i\%_CoreFXTestExecutable%" "%%i\!_TestName!.dll" @"%%i\!_TestName!.rsp" -xml "!_LogPath!\%_CoreFX_TestLogFileName%" -notrait category=nonnetcoreapptests -notrait category=nonwindowstests -notrait category=failing
364354
call "%_CoreFXTestHost%\dotnet.exe" "%%i\%_CoreFXTestExecutable%" "%%i\!_TestName!.dll" @"%%i\!_TestName!.rsp" -xml "!_LogPath!\\%_CoreFX_TestLogFileName%" -notrait category=nonnetcoreapptests -notrait category=nonwindowstests -notrait category=failing
365-
366355
)
367356
goto TestsDone
368357

@@ -572,7 +561,6 @@ if errorlevel 1 (
572561
echo %__MsgPrefix%Created the Test Host layout with all dependencies in %_CoreFXTestHost%
573562

574563
REM Publish and call the CoreFX test helper projects - should this be integrated into runtest.proj?
575-
576564
REM Build Helper project
577565
echo "%_dotnet%" msbuild /t:Restore "%_CoreFXTestSetupUtility%"
578566
call "%_dotnet%" msbuild /t:Restore "%_CoreFXTestSetupUtility%"
@@ -587,7 +575,6 @@ if errorlevel 1 (
587575

588576
exit /b 0
589577

590-
591578
REM =========================================================================================
592579
REM ===
593580
REM === Display a help message describing how to use this script.
@@ -611,7 +598,6 @@ echo VSVersion ^<vs_version^> - VS2015 or VS2017 ^(default: VS2017^).
611598
echo TestEnv ^<test_env_script^> - Run a custom script before every test to set custom test environment settings.
612599
echo AgainstPackages - This indicates that we are running tests that were built against packages.
613600
echo GenerateLayoutOnly - If specified will not run the tests and will only create the Runtime Dependency Layout
614-
echo GenerateTestHostOnly - If specified will not run the tests and will only create the CoreFX test host Layout
615601
echo sequential - Run tests sequentially (no parallelism).
616602
echo crossgen - Precompile ^(crossgen^) the managed assemblies in CORE_ROOT before running the tests.
617603
echo crossgenaltjit ^<altjit^> - Precompile ^(crossgen^) the managed assemblies in CORE_ROOT before running the tests, using the given altjit.

‎tests/runtest.proj

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -377,20 +377,16 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
377377
</Target>
378378

379379
<Target Name="CreateTestHost" DependsOnTargets="ResolveTestHostDependencies">
380-
381380
<MSBuild Projects="$(MSBuildProjectFile)"
382381
Targets="SetupTestingHost"/>
383-
382+
384383
<MSBuild Projects="$(MSBuildProjectFile)"
385384
Targets="GenerateTestSharedFrameworkDepsFile"/>
386-
387385
</Target>
388386

389-
390387
<UsingTask TaskName="GenerateDepsJson" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
391-
<!-- After we build all the source libraries we need to generate a deps.json file for the shared test framework -->
388+
<!-- After we copied all the framework libraries we need to generate a deps.json file for the shared test framework -->
392389
<Target Name="GenerateTestSharedFrameworkDepsFile" AfterTargets="SetupTestingHost">
393-
394390
<ItemGroup>
395391
<!-- This is for HostPolicy, CoreCLR and Jit dependencies to continue to remain inside of the dep.json -->
396392
<ExceptionForDepsJson Include="microsoft.netcore.app" />
@@ -443,20 +439,10 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
443439
DestinationFolder="$(TestHostRootPath)"
444440
SkipUnchangedFiles="true"
445441
UseHardlinksIfPossible="true" />
446-
<Exec Command="chmod +x $(TestHostRootPath)dotnet" Condition="'$(RunningOnUnix)' == 'true'"/>
447442

448443
<Copy SourceFiles="@(CoreCLRBinaries)"
449444
DestinationFolder="$(NETCoreAppTestSharedFrameworkPath)"
450445
SkipUnchangedFiles="true" />
451-
452-
<!-- <Error Condition="'@(CoreFXReferenceCopyLocalPaths)' == ''" /> -->
453-
454-
<Copy SourceFiles="@(CoreFXReferenceCopyLocalPaths)"
455-
DestinationFolder="$(TestHostRootPath)"
456-
SkipUnchangedFiles="true"
457-
UseHardlinksIfPossible="true"
458-
/>
459-
460446
</Target>
461447

462448
<Target Name="RunPerfTests" Condition="'$(Performance)'=='true'">
@@ -487,6 +473,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
487473
Condition=" '$(BuildWrappers)'=='true' " />
488474

489475
<!-- Execution -->
476+
490477
<MSBuild Projects="$(MSBuildProjectFile)"
491478
Targets="CreateTestOverlay"
492479
Condition=" '$(GenerateRuntimeLayout)'=='true' "/>

‎tests/src/Common/CoreFX/CoreFX.depproj

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,4 @@
6161
<ProjectAssetsFile>$(SourceDir)Common\CoreFX\obj\project.assets.json</ProjectAssetsFile>
6262
</PropertyGroup>
6363

64-
<!-- TODO We don't need this -->
65-
<Target Name="AddCoreFXDependencies" BeforeTargets="ResolveReferences">
66-
<Error Condition="!Exists('$(PackagesDir)CoreFx.Private.TestUtilities\$(FxTestUtilVer)')"
67-
Text="Error: looks the package CoreFx.Private.TestUtilities.$(FxTestUtilVer) not restored or missing xunit.console.exe."
68-
/>
69-
<ItemGroup>
70-
<CoreFXReferenceCopyLocalPaths
71-
Include="$(PackagesDir)CoreFx.Private.TestUtilities\$(FxTestUtilVer)\*.*">
72-
<Private>false</Private>
73-
<NuGetPackageId>CoreFx.Private.TestUtilities</NuGetPackageId>
74-
<NuGetPackageVersion>$(FxTestUtilVer)</NuGetPackageVersion>
75-
</CoreFXReferenceCopyLocalPaths>
76-
</ItemGroup>
77-
</Target>
78-
</Project>
64+
</Project>

‎tests/src/Common/test_dependencies/test_dependencies.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
<NugetTargetMoniker>.NETCoreApp,Version=v2.2</NugetTargetMoniker>
99
<NugetTargetMonikerShort>netcoreapp2.2</NugetTargetMonikerShort>
1010
<IsTestProject>false</IsTestProject>
11-
<!-- Don't warn if some dependencies were rolled forward -->
12-
<NoWarn>$(NoWarn);NU1603</NoWarn>
1311
</PropertyGroup>
1412
<ItemGroup>
1513
<PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp">
@@ -31,7 +29,6 @@
3129
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
3230
</PackageReference>
3331
</ItemGroup>
34-
3532
<PropertyGroup>
3633
<TargetFramework>netcoreapp2.2</TargetFramework>
3734
<TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>

0 commit comments

Comments
 (0)