mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Moving the TEST_ARTIFACTS environment variable to the new C# build scripts.

Browse source
This commit is contained in:
Eric Erhardt 2016-02-18 13:35:01 -06:00
parent 3da5ae70e2
commit aca2c8c8dd
4 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/common/_common.ps1
View file

@ -18,9 +18,6 @@ $PackageDir = $env:PackageDir
$TestBinRoot = $env:TestBinRoot
$TestPackageDir = $env:TestPackageDir
$env:TEST_ROOT = "$OutputDir\tests"
$env:TEST_ARTIFACTS = "$env:TEST_ROOT\artifacts"
$env:Channel = "$env:RELEASE_SUFFIX"
# Set reasonable defaults for unset variables

3
scripts/common/_common.sh
View file

@ -14,9 +14,6 @@ COMMONDIR="$( cd -P "$( dirname "$COMMONSOURCE" )" && pwd )"
source "$COMMONDIR/_prettyprint.sh"
# Other variables are set by the outer build script
export TEST_ROOT="$OUTPUT_ROOT/tests"
export TEST_ARTIFACTS="$TEST_ROOT/artifacts"
export CHANNEL=$RELEASE_SUFFIX
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$RID

1
scripts/dotnet-cli-build/TestTargets.cs
View file

@ -190,6 +190,7 @@ namespace Microsoft.DotNet.Cli.Build
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "test", project))
.Environment(vsvars)
.EnvironmentVariable("PATH", $"{DotNetCli.Stage2.BinPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}")
.EnvironmentVariable("TEST_ARTIFACTS", Dirs.TestArtifacts)
.Execute();
if (result.ExitCode != 0)
{

1
scripts/dotnet-cli-build/Utils/Dirs.cs
View file

@ -18,6 +18,7 @@ namespace Microsoft.DotNet.Cli.Build
public static readonly string Stage2Compilation = Path.Combine(Output, "stage2compilation");
public static readonly string Corehost = Path.Combine(Output, "corehost");
public static readonly string TestOutput = Path.Combine(Output, "tests");
public static readonly string TestArtifacts = Path.Combine(TestOutput, "artifacts");
public static readonly string TestPackages = Path.Combine(TestOutput, "packages");
public static readonly string OSXReferenceAssembliesPath = "/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/xbuild-frameworks";