File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -96,7 +96,7 @@ def config_file_path=(rhs)
96
96
#
97
97
# @return [Pathname] the path to use for a given OS
98
98
def config_file_cli_param
99
- OS . linux ? ? config_file_path : @config_dir
99
+ OS . osx ? ? @config_dir : config_file_path
100
100
end
101
101
102
102
# Get an acceptable filename for use as a config file
Original file line number Diff line number Diff line change @@ -80,10 +80,10 @@ def config_fail_msg
80
80
expect ( config_dir ) . to exist
81
81
expect ( config_file ) . to exist
82
82
ret = ArduinoCI ::Host . run_and_capture ( *bug_753_cmd ( backend , config_file ) )
83
- if OS . linux?
84
- expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_success_msg ( config_file ) )
85
- else
83
+ if OS . osx?
86
84
expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_fail_msg )
85
+ else
86
+ expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_success_msg ( config_file ) )
87
87
end
88
88
end
89
89
end
@@ -104,10 +104,10 @@ def config_fail_msg
104
104
expect ( config_dir ) . to exist
105
105
expect ( config_file ) . to exist
106
106
ret = ArduinoCI ::Host . run_and_capture ( *bug_753_cmd ( backend , config_dir ) )
107
- if OS . linux?
108
- expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_fail_msg )
109
- else
107
+ if OS . osx?
110
108
expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_success_msg ( config_file ) )
109
+ else
110
+ expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_fail_msg )
111
111
end
112
112
end
113
113
end
You can’t perform that action at this time.
0 commit comments