1 files changed, 14 insertions, 2 deletions
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 0f243607e..dbe3d1687 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -26,15 +26,21 @@ at_exit { HOMEBREW_PREFIX.parent.rmtree }
 # Test fixtures and files can be found relative to this path
 TEST_FOLDER = Pathname.new(ABS__FILE__).parent.realpath
 
-
+# Note: These exceptions duplicate those defined in globals.
+# Perhaps the same definitions should be used in both places.
 class ExecutionError <RuntimeError
-  attr :exit_status
+  attr :exit_status, :command
 
   def initialize cmd, args = [], es = nil
+    @command = cmd
     super "Failure while executing: #{cmd} #{pretty(args)*' '}"
     @exit_status = es.exitstatus rescue 1
   end
 
+  def was_running_configure?
+    @command == './configure'
+  end
+
   private
 
   def pretty args
@@ -49,6 +55,12 @@ class ExecutionError <RuntimeError
 end
 
 class BuildError <ExecutionError
+  attr :env
+
+  def initialize cmd, args = [], es = nil
+    super
+    @env = ENV.to_hash
+  end
 end
 
 require 'test/unit' # must be after at_exit