From bba906c2cb166c4c303989383ba814c6392543b9 Mon Sep 17 00:00:00 2001
From: peter <peterghost86@gmail.com>
Date: Thu, 14 Mar 2019 10:05:04 -0700
Subject: [PATCH] Simplify env creation when running Windows tests (#17916)

Summary:
Fixes https://github.com/pytorch/pytorch/issues/13465.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/17916

Differential Revision: D14460589

Pulled By: soumith

fbshipit-source-id: e952d08648b833cfd4a8551355ecd68045fea25c
---
 .jenkins/pytorch/win-test.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.jenkins/pytorch/win-test.sh b/.jenkins/pytorch/win-test.sh
index 51a3de8..330a956 100755
--- a/.jenkins/pytorch/win-test.sh
+++ b/.jenkins/pytorch/win-test.sh
@@ -13,6 +13,10 @@ export TMP_DIR_WIN=$(cygpath -w "${TMP_DIR}")
 mkdir -p $TMP_DIR/ci_scripts/
 mkdir -p $TMP_DIR/build/torch
 
+if [ ! -z "$(ls $TMP_DIR/ci_scripts/*)" ]; then
+    rm $TMP_DIR/ci_scripts/*
+fi
+
 cat >$TMP_DIR/ci_scripts/download_image.py << EOL
 
 import os
@@ -39,6 +43,11 @@ EOL
 
 cat >$TMP_DIR/ci_scripts/setup_pytorch_env.bat <<EOL
 
+if exist "%TMP_DIR%/ci_scripts/pytorch_env_restore.bat" (
+    call %TMP_DIR%/ci_scripts/pytorch_env_restore.bat
+    exit /b 0
+)
+
 set PATH=C:\\Program Files\\CMake\\bin;C:\\Program Files\\7-Zip;C:\\ProgramData\\chocolatey\\bin;C:\\Program Files\\Git\\cmd;C:\\Program Files\\Amazon\\AWSCLI;%PATH%
 
 :: Install Miniconda3
@@ -85,6 +94,8 @@ if NOT "%BUILD_ENVIRONMENT%"=="" (
     xcopy /s %CONDA_PARENT_DIR%\\Miniconda3\\Lib\\site-packages\\torch %TMP_DIR_WIN%\\build\\torch\\
 )
 
+for /f "usebackq tokens=*" %%i in (\`set\`) do echo set "%%i" >> %TMP_DIR%/ci_scripts/pytorch_env_restore.bat
+
 EOL
 
 cat >$TMP_DIR/ci_scripts/test_python_nn.bat <<EOL
-- 
2.7.4