$OpenBSD: patch-bzrlib_tests_test_diff_py,v 1.4 2011/12/23 17:12:04 eric Exp $
--- bzrlib/tests/test_diff.py.orig	Thu Oct 27 15:21:20 2011
+++ bzrlib/tests/test_diff.py	Thu Dec 22 17:15:46 2011
@@ -237,7 +237,7 @@ class TestDiffFiles(tests.TestCaseInTempDir):
         # Make sure external_diff doesn't fail in the current LANG
         lines = external_udiff_lines(['\x00foobar\n'], ['foo\x00bar\n'])
 
-        cmd = ['diff', '-u', '--binary', 'old', 'new']
+        cmd = ['gdiff', '-u', 'old', 'new']
         open('old', 'wb').write('\x00foobar\n')
         open('new', 'wb').write('foo\x00bar\n')
         pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE,
@@ -1339,7 +1339,7 @@ class TestDiffFromTool(tests.TestCaseWithTransport):
 
     def test_execute(self):
         output = StringIO()
-        diff_obj = diff.DiffFromTool(['python', '-c',
+        diff_obj = diff.DiffFromTool(['${MODPY_BIN}', '-c',
                                       'print "@old_path @new_path"'],
                                      None, None, output)
         self.addCleanup(diff_obj.finish)