# # # patch "tests/diff_--external/__driver__.lua" # from [81c26da213dc2c202c192d0d3921137e8d71b565] # to [8366b74121cad36d5c5cc971725c1fe9935e5d22] # ============================================================ --- tests/diff_--external/__driver__.lua 81c26da213dc2c202c192d0d3921137e8d71b565 +++ tests/diff_--external/__driver__.lua 8366b74121cad36d5c5cc971725c1fe9935e5d22 @@ -11,38 +11,38 @@ check(get("testhook.lua")) check(get("testhook.lua")) -check(mtn("--rcfile=testhook.lua", "diff", "--external"), 0, true, false) -canonicalize("stdout") +check(mtn("--rcfile=testhook.lua", "diff", "--external"), 0, false, true) +canonicalize("stderr") canonicalize("old_version") canonicalize("new_version") -check(qgrep('file_path: testfile', "stdout")) +check(qgrep('file_path: testfile', "stderr")) check(samefile("old_version", "old_testfile")) check(samefile("new_version", "testfile")) -check(qgrep('diff_args is NIL', "stdout")) -check(qgrep("rev_old: "..old, "stdout")) -check(qgrep("rev_new: "..new, "stdout")) +check(qgrep('diff_args is NIL', "stderr")) +check(qgrep("rev_old: "..old, "stderr")) +check(qgrep("rev_new: "..new, "stderr")) -check(mtn("--rcfile=testhook.lua", "diff", "--external", "--diff-args=-foobar"), 0, true, false) -canonicalize("stdout") +check(mtn("--rcfile=testhook.lua", "diff", "--external", "--diff-args=-foobar"), 0, false, true) +canonicalize("stderr") canonicalize("old_version") canonicalize("new_version") -check(qgrep('file_path: testfile', "stdout")) +check(qgrep('file_path: testfile', "stderr")) check(samefile("old_version", "old_testfile")) check(samefile("new_version", "testfile")) -check(qgrep('diff_args: -foobar', "stdout")) -check(qgrep("rev_old: "..old, "stdout")) -check(qgrep("rev_new: "..new, "stdout")) +check(qgrep('diff_args: -foobar', "stderr")) +check(qgrep("rev_old: "..old, "stderr")) +check(qgrep("rev_new: "..new, "stderr")) -check(mtn("--rcfile=testhook.lua", "diff", "--external", "--diff-args", ""), 0, true, false) -canonicalize("stdout") +check(mtn("--rcfile=testhook.lua", "diff", "--external", "--diff-args", ""), 0, false, true) +canonicalize("stderr") canonicalize("old_version") canonicalize("new_version") -check(qgrep('file_path: testfile', "stdout")) +check(qgrep('file_path: testfile', "stderr")) check(samefile("old_version", "old_testfile")) check(samefile("new_version", "testfile")) -check(qgrep('^diff_args: $', "stdout")) -check(qgrep("rev_old: "..old, "stdout")) -check(qgrep("rev_new: "..new, "stdout")) +check(qgrep('^mtn: lua: diff_args: $', "stderr")) +check(qgrep("rev_old: "..old, "stderr")) +check(qgrep("rev_new: "..new, "stderr")) -- Make sure that --diff-args without --external is an error check(mtn("diff", "--diff-args=foo"), 1, false, false)