From 6890003c4f8dcd8f63a5b280211068cfaf1dcc35 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Tue, 29 Nov 2016 14:19:51 -0800 Subject: Fix test failures in win_command/win_shell on Powershell 3 Switched to use Exit-Json to avoid JSON escaping bugs in ConvertTo-Json formatter without -Compress option. --- windows/win_command.ps1 | 2 +- windows/win_shell.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/win_command.ps1 b/windows/win_command.ps1 index 2a03b6a0..316654b8 100644 --- a/windows/win_command.ps1 +++ b/windows/win_command.ps1 @@ -158,4 +158,4 @@ $result.start = $start_datetime.ToString("yyyy-MM-dd hh:mm:ss.ffffff") $result.end = $end_datetime.ToString("yyyy-MM-dd hh:mm:ss.ffffff") $result.delta = $($end_datetime - $start_datetime).ToString("h\:mm\:ss\.ffffff") -ConvertTo-Json -Depth 99 $result +Exit-Json $result diff --git a/windows/win_shell.ps1 b/windows/win_shell.ps1 index 850f2b95..664858e5 100644 --- a/windows/win_shell.ps1 +++ b/windows/win_shell.ps1 @@ -139,4 +139,4 @@ $result.start = $start_datetime.ToString("yyyy-MM-dd hh:mm:ss.ffffff") $result.end = $end_datetime.ToString("yyyy-MM-dd hh:mm:ss.ffffff") $result.delta = $($end_datetime - $start_datetime).ToString("h\:mm\:ss\.ffffff") -ConvertTo-Json -Depth 99 $result +Exit-Json $result -- cgit v1.2.1