Skip to content

Commit d23802b

Browse files
committed
fixup config path
1 parent b35c28c commit d23802b

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
@@ -78,10 +78,10 @@ def config_fail_msg
7878
expect(config_dir).to exist
7979
expect(config_file).to exist
8080
ret = ArduinoCI::Host.run_and_capture(*bug_753_cmd(backend, config_file))
81-
if OS.linux?
82-
expect(ret[:out].lines[0]).to include(config_success_msg(config_file))
83-
else
81+
if OS.osx?
8482
expect(ret[:out].lines[0]).to include(config_fail_msg)
83+
else
84+
expect(ret[:out].lines[0]).to include(config_success_msg(config_file))
8585
end
8686
end
8787
end
@@ -102,10 +102,10 @@ def config_fail_msg
102102
expect(config_dir).to exist
103103
expect(config_file).to exist
104104
ret = ArduinoCI::Host.run_and_capture(*bug_753_cmd(backend, config_dir))
105-
if OS.linux?
106-
expect(ret[:out].lines[0]).to include(config_fail_msg)
107-
else
105+
if OS.osx?
108106
expect(ret[:out].lines[0]).to include(config_success_msg(config_file))
107+
else
108+
expect(ret[:out].lines[0]).to include(config_fail_msg)
109109
end
110110
end
111111
end

0 commit comments

Comments
 (0)