From bf260ec746bc63d0b642c2435b2860a07b6e263a Mon Sep 17 00:00:00 2001
From: Enrico Giordani <enrico.giordani@gmail.com>
Date: Wed, 10 Jun 2015 00:43:46 +0200
Subject: [PATCH] Test portability fix.

the 'redis-sentinel' binary is not currently built on Windows, the quick
workaround is to call 'redis-server --sentinel'
---
 tests/instances.tcl | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tests/instances.tcl b/tests/instances.tcl
index 90799933cdea..8ae85d32e627 100644
--- a/tests/instances.tcl
+++ b/tests/instances.tcl
@@ -59,13 +59,12 @@ proc spawn_instance {type base_port count {conf {}}} {
 
         # Finally exec it and remember the pid for later cleanup.
         if {$type eq "redis"} {
-            set prgname redis-server
+            set pid [exec ../../../src/redis-server $cfgfile &]             ;# WIN_PORT_ISSUE 
         } elseif {$type eq "sentinel"} {
-            set prgname redis-sentinel
+            set pid [exec ../../../src/redis-server $cfgfile --sentinel &]  ;# WIN_PORT_ISSUE 
         } else {
             error "Unknown instance type."
         }
-        set pid [exec ../../../src/${prgname} $cfgfile &]
         lappend ::pids $pid
 
         # Check availability
@@ -396,11 +395,10 @@ proc restart_instance {type id} {
     # Execute the instance with its old setup and append the new pid
     # file for cleanup.
     if {$type eq "redis"} {
-        set prgname redis-server
+        set pid [exec ../../../src/redis-server $cfgfile &]               ;# WIN_PORT_ISSUE
     } else {
-        set prgname redis-sentinel
+        set pid [exec ../../../src/redis-server $cfgfile --sentinel &]    ;# WIN_PORT_ISSUE
     }
-    set pid [exec ../../../src/${prgname} $cfgfile &]
     set_instance_attrib $type $id pid $pid
     lappend ::pids $pid