File tree 2 files changed +5
-5
lines changed
2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 15
15
# limitations under the License.
16
16
17
17
require 'open3'
18
+ require 'pathname'
18
19
19
20
# Constants.
20
21
LIBRARY_VERSION = '@PROJECT_VERSION_FULL@'
@@ -30,10 +31,7 @@ class Cmd
30
31
command = args [ 0 ]
31
32
exe_name = COMMANDS [ command ]
32
33
33
- if exe_name [ 0 ] == '/'
34
- # If the first character is a slash, we'll assume that we've been given an
35
- # absolute path to the executable. This is only used during test mode.
36
- else
34
+ unless Pathname . new ( exe_name ) . absolute?
37
35
# We're assuming that the library path is relative to the current
38
36
# location of this script.
39
37
exe_name = File . expand_path ( File . join ( File . dirname ( __FILE__ ) , exe_name ) )
Original file line number Diff line number Diff line change 20
20
#include < iostream>
21
21
#include < string>
22
22
23
+ #include < gz/utils/ExtraTestMacros.hh>
24
+
23
25
#include " gtest/gtest.h"
24
26
#include " gz/plugin/Loader.hh"
25
27
@@ -211,7 +213,7 @@ TEST(gzTest, PluginInfoVerboseDummyPlugins)
211
213
212
214
// ////////////////////////////////////////////////
213
215
// / \brief Check --help message and bash completion script for consistent flags
214
- TEST (gzTest, PluginHelpVsCompletionFlags)
216
+ TEST (gzTest, GZ_UTILS_TEST_DISABLED_ON_WIN32( PluginHelpVsCompletionFlags) )
215
217
{
216
218
// Path to gz executable
217
219
std::string gz = std::string (GZ_PATH);
You can’t perform that action at this time.
0 commit comments