(build) move integration scripts and integration code

GitTools · Jun 10, 2020 · 58492a9 · 58492a9
1 parent b4b11e2
commit 58492a9
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -124,5 +124,5 @@ src/Docker/**/content
 config.wyam.dll
 config.wyam.hash
 config.wyam.packages.xml
-/test/core/build
-/test/full/build
+/tests/integration/core/build
+/tests/integration/full/build
diff --git a/build/artifacts-test.cake b/build/artifacts-test.cake
@@ -117,7 +117,7 @@ Task("Artifacts-MsBuildCore-Test")
             continue;
         }
 
-        var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/test/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
+        var cmd = $"-file {rootPrefix}/scripts/Test-MsBuildCore.ps1 -version {version} -repoPath {rootPrefix}/repo/tests/integration/core -nugetPath {rootPrefix}/nuget -targetframework {targetframework}";
 
         DockerTestArtifact(dockerImage, parameters, cmd);
     }
@@ -141,7 +141,7 @@ Task("Artifacts-MsBuildFull-Test")
         dotnetCoreMsBuildSettings.WithProperty("TargetFramework", framework);
         dotnetCoreMsBuildSettings.WithProperty("GitVersionTaskVersion", version);
 
-        var projPath = MakeAbsolute(new DirectoryPath("./test/core"));
+        var projPath = MakeAbsolute(new DirectoryPath("./tests/integration/core"));
 
         DotNetCoreBuild(projPath.FullPath, new DotNetCoreBuildSettings
         {
@@ -151,7 +151,7 @@ Task("Artifacts-MsBuildFull-Test")
             ArgumentCustomization = args => args.Append($"--source {nugetSource}")
         });
 
-        var netcoreExe = new DirectoryPath("./test/core/build").Combine(framework).CombineWithFilePath("app.dll");
+        var netcoreExe = new DirectoryPath("./tests/integration/core/build").Combine(framework).CombineWithFilePath("app.dll");
         ValidateOutput("dotnet", netcoreExe.FullPath, parameters.Version.GitVersion.FullSemVer);
     }
 
@@ -166,9 +166,9 @@ Task("Artifacts-MsBuildFull-Test")
     msBuildSettings.WithProperty("GitVersionTaskVersion", version);
     msBuildSettings.WithProperty("RestoreSource", nugetSource);
 
-    MSBuild("./test/full", msBuildSettings);
+    MSBuild("./tests/integration/full", msBuildSettings);
 
-    var fullExe = new DirectoryPath("./test/full/build").CombineWithFilePath("app.exe");
+    var fullExe = new DirectoryPath("./tests/integration/full/build").CombineWithFilePath("app.exe");
     ValidateOutput(fullExe.FullPath, null, parameters.Version.GitVersion.FullSemVer);
 });
 

diff --git a/build/utils/docker.cake b/build/utils/docker.cake
@@ -116,7 +116,7 @@ DockerContainerRunSettings GetDockerRunSettings(BuildParameters parameters)
         Volume = new[]
         {
             $"{currentDir}:{root}/repo",
-            $"{currentDir}/test-scripts:{root}/scripts",
+            $"{currentDir}/tests/scripts:{root}/scripts",
             $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/nuget:{root}/nuget",
             $"{currentDir}/artifacts/v{parameters.Version.SemVersion}/native/linux:{root}/native",
         }

diff --git a/test/Directory.Build.props → tests/integration/Directory.Build.props b/test/Directory.Build.props → tests/integration/Directory.Build.props
diff --git a/test/Directory.Build.targets → tests/integration/Directory.Build.targets b/test/Directory.Build.targets → tests/integration/Directory.Build.targets
diff --git a/test/Program.cs → tests/integration/Program.cs b/test/Program.cs → tests/integration/Program.cs
diff --git a/test/core/app.csproj → tests/integration/core/app.csproj b/test/core/app.csproj → tests/integration/core/app.csproj
diff --git a/test/full/app.csproj → tests/integration/full/app.csproj b/test/full/app.csproj → tests/integration/full/app.csproj
diff --git a/test-scripts/Test-DotnetGlobalTool.ps1 → tests/scripts/Test-DotnetGlobalTool.ps1 b/test-scripts/Test-DotnetGlobalTool.ps1 → tests/scripts/Test-DotnetGlobalTool.ps1
diff --git a/test-scripts/Test-MsBuildCore.ps1 → tests/scripts/Test-MsBuildCore.ps1 b/test-scripts/Test-MsBuildCore.ps1 → tests/scripts/Test-MsBuildCore.ps1
diff --git a/test-scripts/Test-Native.ps1 → tests/scripts/Test-Native.ps1 b/test-scripts/Test-Native.ps1 → tests/scripts/Test-Native.ps1