Fix default target directory

malept · Apr 6, 2017 · ca3b4f2 · ca3b4f2
1 parent 9b43020
commit ca3b4f2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## Fixed
+
+* Default target directory (when the CARGO_TARGET_DIR is not set)
+
 ## [0.12.0] - 2017-04-05
 
 ### Added

diff --git a/lib/thermite/config.rb b/lib/thermite/config.rb
@@ -170,10 +170,10 @@ def rust_path(*path_components)
 
     #
     # Generate a path relative to the `CARGO_TARGET_DIR` environment variable, or
-    # {#rust_toplevel_dir} if that is not set.
+    # {#rust_toplevel_dir}/target if that is not set.
     #
     def cargo_target_path(target, *path_components)
-      target_base = ENV.fetch('CARGO_TARGET_DIR', rust_toplevel_dir)
+      target_base = ENV.fetch('CARGO_TARGET_DIR', File.join(rust_toplevel_dir, 'target'))
       File.join(target_base, target, *path_components)
     end
 

diff --git a/test/lib/thermite/config_test.rb b/test/lib/thermite/config_test.rb
@@ -119,7 +119,7 @@ def test_cargo_target_path_with_env_var
     def test_cargo_target_path_without_env_var
       FileUtils.stubs(:pwd).returns('/tmp/foobar')
       ENV['CARGO_TARGET_DIR'] = nil
-      assert_equal File.join('/tmp/foobar', 'debug', 'bar'),
+      assert_equal File.join('/tmp/foobar', 'target', 'debug', 'bar'),
                    config.cargo_target_path('debug', 'bar')
     end