Use rebar from project root directory

Author: ericmj

lib/mix/lib/mix/shell/process.ex

@@ -18,7 +18,7 @@ defmodule Mix.Shell.Process do
   @behavior Mix.Shell
 
   @doc """
-  Flush all :mix_shell messages from the current process.
+  Flush all :mix_shell and :mix_shell_input messages from the current process.
   If a callback is given, it is invoked for each received message.
 
   ## Examples
@@ -31,6 +31,9 @@ defmodule Mix.Shell.Process do
       { :mix_shell, _, _ } = message ->
         callback.(message)
         flush(callback)
+      { :mix_shell_input, _, _ } = message ->
+        callback.(message)
+        flush(callback)
     after
       0 -> :done
     end

lib/mix/test/mix/rebar_test.exs

@@ -30,31 +30,32 @@ defmodule Mix.RebarTest do
   test "parse rebar dependencies" do
     Mix.Project.push(RebarAsDep)
 
-    in_tmp "parse rebar dependencies", fn ->
-      deps = Mix.Deps.all
-      assert Enum.find(deps, match?(Mix.Dep[app: :rebar_dep], &1))
+    deps = Mix.Deps.all
+    assert Enum.find(deps, match?(Mix.Dep[app: :rebar_dep], &1))
 
-      assert Enum.find(deps, fn dep ->
-        Mix.Dep[app: app, opts: opts] = dep
-        if app == :git_rebar do
-          assert Enum.find(opts, match?({:git, "../git_rebar"}, &1))
-          assert Enum.find(opts, match?({:ref, "master"}, &1))
-          true
-        end
-      end)
-    end
+    assert Enum.find(deps, fn dep ->
+      Mix.Dep[app: app, opts: opts] = dep
+      if app == :git_rebar do
+        assert Enum.find(opts, match?({:git, "../git_rebar"}, &1))
+        assert Enum.find(opts, match?({:ref, "master"}, &1))
+        true
+      end
+    end)
   after
     Mix.Project.pop
   end
 
   test "get and compile dependencies for rebar" do
+    # Use rebar from project root
+    System.put_env("MIX_HOME", MixTest.Case.elixir_root)
+
     Mix.Project.push(RebarAsDep)
 
     in_tmp "dependencies for rebar", fn ->
-      Mix.Tasks.Deps.Get.run []
+      Mix.Tasks.Deps.Get.run ["--no-compile"]
       assert_received { :mix_shell, :info, ["* Getting git_rebar [git: \"../git_rebar\"]"] }
 
-      Mix.Tasks.Compile.run []
+      Mix.Tasks.Deps.Compile.run []
       assert_received { :mix_shell, :info, ["* Compiling git_rebar"] }
       assert_received { :mix_shell, :info, ["* Compiling rebar_dep"] }
       assert :git_rebar.any_function == :ok

lib/mix/test/test_helper.exs

@@ -27,6 +27,10 @@ defmodule MixTest.Case do
     System.cmd "#{elixir_executable} #{mix_executable} #{args}"
   end
 
+  def elixir_root do
+    Path.expand("../../..", __DIR__)
+  end
+
   def mix_executable do
     Path.expand("../../../bin/mix", __DIR__)
   end