From dacaebefb88a32bf95c44a9a9ffedfd83b3b1535 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andschwa@microsoft.com>
Date: Wed, 10 Feb 2016 12:55:28 -0800
Subject: [PATCH] Move Pester to submodule to Host/Modules

This way it can also be deployed automatically, removing the last manual
copy steps from our build scripts.

Travis and AppVeyor configurations updated for new submodule location.
---
 .gitmodules                                               | 4 ++--
 .travis.yml                                               | 2 +-
 appveyor.yml                                              | 2 +-
 build.ps1                                                 | 7 -------
 build.sh                                                  | 8 --------
 .../Microsoft.PowerShell.Linux.Host/Modules}/Pester       | 0
 6 files changed, 4 insertions(+), 19 deletions(-)
 rename {test => src/Microsoft.PowerShell.Linux.Host/Modules}/Pester (100%)

diff --git a/.gitmodules b/.gitmodules
index 472a5b1b53..903caa401b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,8 +17,8 @@
 [submodule "src/windows-build"]
 	path = src/windows-build
 	url = https://github.com/PowerShell/psl-windows-build.git
-[submodule "test/Pester"]
-	path = test/Pester
+[submodule "src/Microsoft.PowerShell.Linux.Host/Modules/Pester"]
+	path = src/Microsoft.PowerShell.Linux.Host/Modules/Pester
 	url = https://github.com/PowerShell/psl-pester.git
 	branch = develop
 	ignore = dirty
diff --git a/.travis.yml b/.travis.yml
index 322d2936ce..85668156c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ git:
   submodules: false
 before_install:
   - git config --global url.git@github.com:.insteadOf https://github.com/
-  - git submodule update --init --recursive -- src/libpsl-native src/monad src/windows-build test/Pester
+  - git submodule update --init --recursive -- src/libpsl-native src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
   - sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list'
   - sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893
   - sudo apt-get -qq update
diff --git a/appveyor.yml b/appveyor.yml
index 4da4007f02..fb5139794d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,7 +13,7 @@ install:
   - ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
   - ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
   - git config --global url.git@github.com:.insteadOf https://github.com/
-  - git submodule update --init --recursive -- src/monad src/windows-build test/Pester
+  - git submodule update --init --recursive -- src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester
   - ps: Invoke-WebRequest -Uri https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/Latest/dotnet-win-x64.latest.zip -OutFile dotnet.zip
   - 7z x dotnet.zip -odotnet > nul
 
diff --git a/build.ps1 b/build.ps1
index e964962bec..1653f9b8d4 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,12 +1,5 @@
 $BIN = "${pwd}/bin"
 
-mkdir $BIN/Modules -ErrorAction SilentlyContinue
-
-# Deploy PowerShell modules
-cd $BIN/Modules
-robocopy ../../test/Pester Pester /s /e
-cd ../..
-
 # Publish PowerShell
 cd src/Microsoft.PowerShell.Linux.Host
 dotnet publish --framework dnxcore50 --output $BIN
diff --git a/build.sh b/build.sh
index 717c695afe..2b3d8b2ed2 100755
--- a/build.sh
+++ b/build.sh
@@ -2,14 +2,6 @@
 
 export BIN=$(pwd)/bin
 
-mkdir -p $BIN/Modules
-
-# Deploy PowerShell modules
-(
-    cd $BIN/Modules
-    cp -r ../../test/Pester .
-)
-
 # Build native components
 (
     cd src/libpsl-native
diff --git a/test/Pester b/src/Microsoft.PowerShell.Linux.Host/Modules/Pester
similarity index 100%
rename from test/Pester
rename to src/Microsoft.PowerShell.Linux.Host/Modules/Pester