Merge c4c6cd7 into d493371

loader/src/cmd/cmdplugin.rb.in

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require 'open3'
+require 'pathname'
 
 # Constants.
 LIBRARY_VERSION = '@PROJECT_VERSION_FULL@'
@@ -30,10 +31,7 @@ class Cmd
     command = args[0]
     exe_name = COMMANDS[command]
 
-    if exe_name[0] == '/'
-      # If the first character is a slash, we'll assume that we've been given an
-      # absolute path to the executable. This is only used during test mode.
-    else
+    unless Pathname.new(exe_name).absolute?
       # We're assuming that the library path is relative to the current
       # location of this script.
       exe_name = File.expand_path(File.join(File.dirname(__FILE__), exe_name))

loader/src/gz_TEST.cc

@@ -20,6 +20,8 @@
 #include <iostream>
 #include <string>
 
+#include <gz/utils/ExtraTestMacros.hh>
+
 #include "gtest/gtest.h"
 #include "gz/plugin/Loader.hh"
 
@@ -211,7 +213,7 @@ TEST(gzTest, PluginInfoVerboseDummyPlugins)
 
 //////////////////////////////////////////////////
 /// \brief Check --help message and bash completion script for consistent flags
-TEST(gzTest, PluginHelpVsCompletionFlags)
+TEST(gzTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(PluginHelpVsCompletionFlags))
 {
   // Path to gz executable
   std::string gz = std::string(GZ_PATH);