From 19d5b2b53a7e586318243c5396fab46487db13cb Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Wed, 2 Mar 2016 16:45:13 -0800 Subject: [PATCH 1/2] Bump monad and windows-build with Source Depot changes Resolves #610. --- src/monad | 2 +- src/windows-build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/monad b/src/monad index e0dc79b074..1d26807583 160000 --- a/src/monad +++ b/src/monad @@ -1 +1 @@ -Subproject commit e0dc79b0744bba098e931a8266df97da478eccda +Subproject commit 1d26807583f36a3e86d8c4f970173e6ffe747dbb diff --git a/src/windows-build b/src/windows-build index 994a3f231b..64f2c7d5b3 160000 --- a/src/windows-build +++ b/src/windows-build @@ -1 +1 @@ -Subproject commit 994a3f231be9284fef2ea77720a9a72745ca39cc +Subproject commit 64f2c7d5b3587d2fc94f683f8f7311686188dd97 From 7857f13165dff6fc56e0183e6d87aef91485040d Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Thu, 3 Mar 2016 17:09:31 -0800 Subject: [PATCH 2/2] Skip SymbolicLink tests on Windows On Windows, making symbolic links requires administrator access, so let's skip it. --- test/powershell/New-Item.Tests.ps1 | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/powershell/New-Item.Tests.ps1 b/test/powershell/New-Item.Tests.ps1 index ef4e42090b..1ab992c7ba 100644 --- a/test/powershell/New-Item.Tests.ps1 +++ b/test/powershell/New-Item.Tests.ps1 @@ -17,6 +17,7 @@ } Describe "New-Item" { + $isWindows = [System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform([System.Runtime.InteropServices.OSPlatform]::Windows) $tmpDirectory = $TestDrive $testfile = "testfile.txt" $testfolder = "newDirectory" @@ -101,6 +102,12 @@ Describe "New-Item" { } It "Should create a symbolic link of a file without error" { + # Making symbolic links on Windows requires administrator access + if ($isWindows) + { + return + } + New-Item -Name $testfile -Path $tmpDirectory -ItemType file Test-Path $FullyQualifiedFile | Should Be $true @@ -109,6 +116,12 @@ Describe "New-Item" { } It "Should create a symbolic link from directory without error" { + # Making symbolic links on Windows requires administrator access + if ($isWindows) + { + return + } + New-Item -Name $testFolder -Path $tmpDirectory -ItemType directory Test-Path $FullyQualifiedFolder | Should Be $true @@ -118,6 +131,4 @@ Describe "New-Item" { # Remove the link explicitly to avoid broken symlink issue Remove-Item $FullyQualifiedLink -Force } - - }