Skip to content

Commit 5f66151

Browse files
committed
fixup config path
1 parent 21c3c20 commit 5f66151

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/arduino_ci/arduino_backend.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def config_file_path=(rhs)
9696
#
9797
# @return [Pathname] the path to use for a given OS
9898
def config_file_cli_param
99-
OS.linux? ? config_file_path : @config_dir
99+
OS.osx? ? @config_dir : config_file_path
100100
end
101101

102102
# Get an acceptable filename for use as a config file

spec/arduino_installation_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ def config_fail_msg
8080
expect(config_dir).to exist
8181
expect(config_file).to exist
8282
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?
8684
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))
8787
end
8888
end
8989
end
@@ -104,10 +104,10 @@ def config_fail_msg
104104
expect(config_dir).to exist
105105
expect(config_file).to exist
106106
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?
110108
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)
111111
end
112112
end
113113
end

0 commit comments

Comments
 (0)