summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSerdar Sutay <serdar@opscode.com>2013-11-06 09:26:30 -0800
committerSerdar Sutay <serdar@opscode.com>2013-11-06 09:26:30 -0800
commit8cc3f13dca9d37282c85d9d9800d1d84d9db553f (patch)
treef462649080e4a87fd3fab40c4da9ed582e3400cc /lib
parentb8f2dc8a2acc9e9978f5f2c30aaa6b31b4e9cd94 (diff)
parentb60b4d5bcf0a4f14a4788ca2b8eff2668e00b7e7 (diff)
downloadchef-8cc3f13dca9d37282c85d9d9800d1d84d9db553f.tar.gz
Merge pull request #1109 from opscode/ci-script-fix
Enable integration tests in CI and fix the way tests are launched.
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/knife.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index 341402242e..d4d1a3c534 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -239,7 +239,14 @@ class Chef
end
def self.working_directory
- ENV['PWD'] || Dir.pwd
+ a = if Chef::Platform.windows?
+ ENV['CD']
+ else
+ ENV['PWD']
+ end || Dir.pwd
+
+ puts "Working directory: #{a}"
+ a
end
def self.reset_config_path!