remove_make_var! should not leave an empty assignment

1 files changed, 10 insertions, 2 deletions

diff --git a/Library/Homebrew/test/test_inreplace.rb b/Library/Homebrew/test/test_inreplace.rb
index af961101e..ab9659b36 100644
--- a/Library/Homebrew/test/test_inreplace.rb
+++ b/Library/Homebrew/test/test_inreplace.rb
@@ -14,13 +14,21 @@ class InreplaceTest < Test::Unit::TestCase
     s1.change_make_var! "FLAG", "\\1 def"
     assert_equal "FLAG=abc def", s1
   end
+  
+  def test_change_make_var_shell_style
+    # Shell variables have no spaces around =
+    s1="FLAG=abc"
+    s1.extend(HomebrewInreplaceExtension)
+    s1.change_make_var! "FLAG", "def"
+    assert_equal "FLAG=def", s1
+  end
 
   def test_remove_make_var
     # Replace flag
     s1="FLAG = abc\nFLAG2 = def"
     s1.extend(HomebrewInreplaceExtension)
     s1.remove_make_var! "FLAG"
-    assert_equal "FLAG=\nFLAG2 = def", s1
+    assert_equal "FLAG2 = def", s1
   end
 
   def test_remove_make_vars
@@ -28,6 +36,6 @@ class InreplaceTest < Test::Unit::TestCase
     s1="FLAG = abc\nFLAG2 = def"
     s1.extend(HomebrewInreplaceExtension)
     s1.remove_make_var! ["FLAG", "FLAG2"]
-    assert_equal "FLAG=\nFLAG2=", s1
+    assert_equal "", s1
   end
 end