Down to 3 failures

Author: josevalim

lib/mix/lib/mix.ex

@@ -1077,7 +1077,7 @@ defmodule Mix do
       app: @mix_install_app,
       erlc_paths: [],
       elixirc_paths: [],
-      compilers: [],
+      compilers: [:elixir],
       prune_code_paths: false
     ] ++ dynamic_config
   end

lib/mix/lib/mix/tasks/compile.elixir.ex

@@ -130,7 +130,7 @@ defmodule Mix.Tasks.Compile.Elixir do
         # TODO: Deprecate me on Elixir v1.23
         Keyword.put(opts, :consolidate_protocols, false)
       else
-        opts
+        opts ++ Keyword.take(project, [:consolidate_protocols])
       end
 
     # Having compilations racing with other is most undesired,

lib/mix/test/mix/tasks/compile.elixir_test.exs

@@ -1315,6 +1315,7 @@ defmodule Mix.Tasks.Compile.ElixirTest do
       assert Mix.Tasks.Compile.Elixir.run(["--verbose"]) == {:ok, []}
       assert_received {:mix_shell, :info, ["Compiling 1 file (.ex)"]}
       assert_received {:mix_shell, :info, ["Compiled lib/a.ex"]}
+      Mix.shell().flush()
 
       File.rm!("lib/a.ex")
       assert Mix.Tasks.Compile.Elixir.run(["--verbose"]) == {:ok, []}

lib/mix/test/mix/tasks/compile_test.exs

@@ -55,22 +55,9 @@ defmodule Mix.Tasks.CompileTest do
       assert_received {:mix_shell, :info, ["Generated sample app"]}
       assert File.regular?("_build/dev/lib/sample/consolidated/Elixir.Enumerable.beam")
 
-      # Noop
       Mix.Task.clear()
       assert Mix.Task.run("compile", ["--verbose"]) == {:noop, []}
       refute_received {:mix_shell, :info, ["Compiled lib/a.ex"]}
-
-      # Consolidates protocols if manifest is out of date
-      File.rm("_build/dev/lib/sample/.mix/compile.protocols")
-      Mix.Task.clear()
-      assert Mix.Task.run("compile", ["--verbose"]) == {:ok, []}
-      refute_received {:mix_shell, :info, ["Compiled lib/a.ex"]}
-      assert File.regular?("_build/dev/lib/sample/consolidated/Elixir.Enumerable.beam")
-
-      # Purge so consolidated is picked up
-      purge([Enumerable])
-      assert Mix.Tasks.App.Start.run(["--verbose"]) == :ok
-      assert Protocol.consolidated?(Enumerable)
     end)
   end
 
@@ -224,10 +211,10 @@ defmodule Mix.Tasks.CompileTest do
     end)
   end
 
-  test "skip protocol consolidation when --no-consolidate-protocols" do
+  test "skip protocol consolidation when --no-protocol-consolidation" do
     in_fixture("no_mixfile", fn ->
       File.rm("_build/dev/lib/sample/.mix/compile.protocols")
-      assert Mix.Task.run("compile", ["--no-consolidate-protocols"]) == {:ok, []}
+      assert Mix.Task.run("compile", ["--no-protocol-consolidation"]) == {:ok, []}
       assert File.regular?("_build/dev/lib/sample/ebin/Elixir.A.beam")
       refute File.regular?("_build/dev/lib/sample/consolidated/Elixir.Enumerable.beam")
     end)
@@ -283,7 +270,7 @@ defmodule Mix.Tasks.CompileTest do
     Mix.Project.push(WrongPath)
 
     ExUnit.CaptureIO.capture_io(fn ->
-      assert Mix.Task.run("compile", ["--no-consolidate-protocols"]) == {:noop, []}
+      assert Mix.Task.run("compile", ["--no-protocol-consolidation"]) == {:noop, []}
     end)
   end