Skip to content

Commit 58492a9

Browse files
committed
(build) move integration scripts and integration code
1 parent b4b11e2 commit 58492a9

File tree

11 files changed

+8
-8
lines changed

11 files changed

+8
-8
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,5 +124,5 @@ src/Docker/**/content
124124
config.wyam.dll
125125
config.wyam.hash
126126
config.wyam.packages.xml
127-
/test/core/build
128-
/test/full/build
127+
/tests/integration/core/build
128+
/tests/integration/full/build

build/artifacts-test.cake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Task("Artifacts-MsBuildCore-Test")
117117
continue;
118118
}
119119

120-
var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/test/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
120+
var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/tests/integration/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
121121

122122
DockerTestArtifact(dockerImage, parameters, cmd);
123123
}
@@ -141,7 +141,7 @@ Task("Artifacts-MsBuildFull-Test")
141141
dotnetCoreMsBuildSettings.WithProperty("TargetFramework", framework);
142142
dotnetCoreMsBuildSettings.WithProperty("GitVersionTaskVersion", version);
143143

144-
var projPath = MakeAbsolute(new DirectoryPath("./test/core"));
144+
var projPath = MakeAbsolute(new DirectoryPath("./tests/integration/core"));
145145

146146
DotNetCoreBuild(projPath.FullPath, new DotNetCoreBuildSettings
147147
{
@@ -151,7 +151,7 @@ Task("Artifacts-MsBuildFull-Test")
151151
ArgumentCustomization = args => args.Append($"--source {nugetSource}")
152152
});
153153

154-
var netcoreExe = new DirectoryPath("./test/core/build").Combine(framework).CombineWithFilePath("app.dll");
154+
var netcoreExe = new DirectoryPath("./tests/integration/core/build").Combine(framework).CombineWithFilePath("app.dll");
155155
ValidateOutput("dotnet", netcoreExe.FullPath, parameters.Version.GitVersion.FullSemVer);
156156
}
157157

@@ -166,9 +166,9 @@ Task("Artifacts-MsBuildFull-Test")
166166
msBuildSettings.WithProperty("GitVersionTaskVersion", version);
167167
msBuildSettings.WithProperty("RestoreSource", nugetSource);
168168

169-
MSBuild("./test/full", msBuildSettings);
169+
MSBuild("./tests/integration/full", msBuildSettings);
170170

171-
var fullExe = new DirectoryPath("./test/full/build").CombineWithFilePath("app.exe");
171+
var fullExe = new DirectoryPath("./tests/integration/full/build").CombineWithFilePath("app.exe");
172172
ValidateOutput(fullExe.FullPath, null, parameters.Version.GitVersion.FullSemVer);
173173
});
174174

build/utils/docker.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
116116
Volume = new[]
117117
{
118118
$"{currentDir}:{root}/repo",
119-
$"{currentDir}/test-scripts:{root}/scripts",
119+
$"{currentDir}/tests/scripts:{root}/scripts",
120120
$"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{root}/nuget",
121121
$"{currentDir}/artifacts/v{parameters.Version.SemVersion}/native/linux:{root}/native",
122122
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)