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 @@ -79,10 +79,10 @@ def config_fail_msg
79
79
expect ( config_dir ) . to exist
80
80
expect ( config_file ) . to exist
81
81
ret = ArduinoCI ::Host . run_and_capture ( *bug_753_cmd ( backend , config_file ) )
82
- if OS . linux?
83
- expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_success_msg ( config_file ) )
84
- else
82
+ if OS . osx?
85
83
expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_fail_msg )
84
+ else
85
+ expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_success_msg ( config_file ) )
86
86
end
87
87
end
88
88
end
@@ -103,10 +103,10 @@ def config_fail_msg
103
103
expect ( config_dir ) . to exist
104
104
expect ( config_file ) . to exist
105
105
ret = ArduinoCI ::Host . run_and_capture ( *bug_753_cmd ( backend , config_dir ) )
106
- if OS . linux?
107
- expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_fail_msg )
108
- else
106
+ if OS . osx?
109
107
expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_success_msg ( config_file ) )
108
+ else
109
+ expect ( ret [ :out ] . lines [ 0 ] ) . to include ( config_fail_msg )
110
110
end
111
111
end
112
112
end
You can’t perform that action at this time.
0 commit comments