diff options
author | wtgodbe <wigodbe@microsoft.com> | 2017-01-31 10:56:32 -0800 |
---|---|---|
committer | wtgodbe <wigodbe@microsoft.com> | 2017-01-31 10:56:32 -0800 |
commit | 60422521a182dc51d31911c941bdf7b39d45632a (patch) | |
tree | 535304ba6f9040224b7c9ab061db258276e8cf15 | |
parent | b2b3e07625fa3308110d88cd9f013f788e02e5f7 (diff) | |
download | coreclr-60422521a182dc51d31911c941bdf7b39d45632a.tar.gz coreclr-60422521a182dc51d31911c941bdf7b39d45632a.tar.bz2 coreclr-60422521a182dc51d31911c941bdf7b39d45632a.zip |
Download native binaries into a folder named 'RID'
-rw-r--r-- | build-test.cmd | 4 | ||||
-rw-r--r-- | config.json | 6 | ||||
-rw-r--r-- | src/syncAzure.proj | 3 | ||||
-rw-r--r-- | sync.cmd | 5 |
4 files changed, 13 insertions, 5 deletions
diff --git a/build-test.cmd b/build-test.cmd index 66b956674b..85753abccf 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -224,8 +224,8 @@ if defined __RuntimeId ( ) call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\runtest.proj -CreateNonWindowsTestOverlay -RuntimeId="%__RuntimeId%" -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__unprocessedBuildArgs% - for /R %__PackagesDir%\TestNativeBins\%__RuntimeId% %%f in (*.so) do copy %%f %Core_Overlay% - for /R %__PackagesDir%\TestNativeBins\%__RuntimeId% %%f in (*.dylib) do copy %%f %Core_Overlay% + for /R %__PackagesDir%\TestNativeBins\%__RuntimeId%\%__BuildType% %%f in (*.so) do copy %%f %Core_Overlay% + for /R %__PackagesDir%\TestNativeBins\%__RuntimeId%\%__BuildType% %%f in (*.dylib) do copy %%f %Core_Overlay% echo %__MsgPrefix% Created the runtime layout for %__RuntimeId% in %CORE_OVERLAY% ) diff --git a/config.json b/config.json index d519b00dad..be0b4bd121 100644 --- a/config.json +++ b/config.json @@ -466,6 +466,12 @@ "__Container": "default" } }, + "runtimeId": { + "description": "Runtime ID of the binaries in the specified container.", + "settings": { + "RuntimeId": "default" + } + }, "verbose": { "description": "Passes /flp:v=diag to the msbuild command or the value passed by the user.", "settings": { diff --git a/src/syncAzure.proj b/src/syncAzure.proj index 9c262b3c11..a5bb4958a9 100644 --- a/src/syncAzure.proj +++ b/src/syncAzure.proj @@ -8,7 +8,7 @@ <ContainerName Condition="'$(__Container)' != ''">$(__Container)</ContainerName> <ContainerName>$(ContainerName.Replace(".","-"))</ContainerName> <DownloadDirectory Condition="'$(PublishTestNativeBins)' != 'true'">$(PackagesDir)AzureTransfer</DownloadDirectory> - <DownloadDirectory Condition="'$(PublishTestNativeBins)' == 'true'">$(PackagesDir)TestNativeBins</DownloadDirectory> + <DownloadDirectory Condition="'$(PublishTestNativeBins)' == 'true'">$(PackagesDir)TestNativeBins\$(RuntimeId)</DownloadDirectory> </PropertyGroup> <Import Project="$(ToolsDir)SyncCloudContent.targets" /> @@ -17,6 +17,7 @@ <Error Condition="'$(CloudDropAccountName)' == ''" Text="Missing property CloudDropAccountName." /> <Error Condition="'$(CloudDropAccessToken)' == ''" Text="Missing property CloudDropAccessToken." /> <Error Condition="'$(__Container)' == '' and '$(PublishTestNativeBins)' == 'true'" Text="Missing property Container." /> + <Error Condition="'$(RuntimeId)' == '' and '$(PublishTestNativeBins)' == 'true'" Text="Missing property RuntimeId." /> </Target> <Target Name="Build" DependsOnTargets="ValidateRequiredProperties;DownloadBlobsFromAzureTargets" /> @@ -26,11 +26,12 @@ echo -BuildMajor echo -BuildMinor echo To download from a specific container, specify: echo -Container="container name" -echo -n - Downloads test native binaries for the specified OS +echo -n - Downloads test native binaries from the specified container echo The following properties are required: echo -AzureAccount="Account name" echo -AzureToken="Access token" -echo -Container="container name (with RID suffix)" +echo -Container="Container name" +echo -RuntimeId="RID" (Needs to match what's in the container) echo. echo. echo. |