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

Test directory refactoring step 1.

Browse source 
Moving TestProjects and TestPackages under root 'TestAssets' folder.

Partial fix #1250
This commit is contained in:
Eric Erhardt 2016-02-05 17:43:50 -06:00
parent 129bd03098
commit 3d14caceff
71 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/test/argument-forwarding-tests.ps1
View file

@ -5,8 +5,6 @@
. "$PSScriptRoot\..\common\_common.ps1"
$TestPackagesPath = "$RepoRoot\tests\packages"
$ArgTestRoot = "$RepoRoot\test\ArgumentForwardingTests"
$ArgTestOutputRoot = "$RepoRoot\artifacts\tests\arg-forwarding"

2
scripts/test/run-tests.ps1
View file

@ -27,7 +27,7 @@ popd
# copy TestProjects to $TestBinRoot
mkdir -Force "$TestBinRoot\TestProjects"
cp -rec -Force "$RepoRoot\test\TestProjects\*" "$TestBinRoot\TestProjects"
cp -rec -Force "$RepoRoot\TestAssets\TestProjects\*" "$TestBinRoot\TestProjects"
# Run each test project
$TestProjects | foreach {

2
scripts/test/run-tests.sh
View file

@ -24,7 +24,7 @@ failCount=0
# Copy TestProjects to $TEST_BIN_ROOT
mkdir -p "$TEST_BIN_ROOT/TestProjects"
cp -a $REPOROOT/test/TestProjects/* $TEST_BIN_ROOT/TestProjects
cp -a $REPOROOT/TestAssets/TestProjects/* $TEST_BIN_ROOT/TestProjects
pushd "$TEST_BIN_ROOT"
set +e

2
scripts/test/setup/build-test-prerequisites.ps1
View file

@ -8,7 +8,7 @@
mkdir -Force $TestPackageDir
loadTestPackageList | foreach {
dotnet pack "$RepoRoot\test\TestPackages\$($_.ProjectName)" --output "$TestPackageDir"
dotnet pack "$RepoRoot\TestAssets\TestPackages\$($_.ProjectName)" --output "$TestPackageDir"
if (!$?) {
error "Command failed: dotnet pack"

2
scripts/test/setup/build-test-prerequisites.sh
View file

@ -23,5 +23,5 @@ PROJECTS=$(loadTestPackageList)
for project in $PROJECTS
do
dotnet pack "$REPOROOT/test/TestPackages/$project" --output "$TEST_PACKAGE_DIR"
dotnet pack "$REPOROOT/TestAssets/TestPackages/$project" --output "$TEST_PACKAGE_DIR"
done

4
scripts/test/setup/restore-test-prerequisites.ps1
View file

@ -5,8 +5,8 @@
". $PSScriptRoot\..\..\common\_common.ps1"
header "Restoring packages"
& dotnet restore "$RepoRoot\test\TestPackages" --quiet --runtime "$Rid"
header "Restoring TestAssets"
& dotnet restore "$RepoRoot\TestAssets" --quiet --runtime "$Rid"
$oldErrorAction=$ErrorActionPreference
$ErrorActionPreference="SilentlyContinue"

4
scripts/test/setup/restore-test-prerequisites.sh
View file

@ -16,8 +16,8 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/../../common/_common.sh"
header "Restoring packages"
dotnet restore "$REPOROOT/test/TestPackages" --runtime $RID --quiet $DISABLE_PARALLEL
header "Restoring TestAssets"
dotnet restore "$REPOROOT/TestAssets" --runtime $RID --quiet $DISABLE_PARALLEL
set +e
dotnet restore "$REPOROOT/testapp" --runtime $RID $DISABLE_PARALLEL >/dev/null 2>&1