#
#
# patch "tests/disallowing_persistence_of_passphrase/__driver__.lua"
#  from [f958eef23ce1d9afe61383d47a3bca777e206a8a]
#    to [dd1479635e0685e6e78a0e5fbbd9265494703342]
# 
# patch "tests/imp_test_filesync_confdir/__driver__.lua"
#  from [4962a95b8b12e9d65c4efc64781033fed9d088d7]
#    to [a0c260d405c38adf1a0db939f8b3b0549e442528]
#
============================================================
--- tests/disallowing_persistence_of_passphrase/__driver__.lua	f958eef23ce1d9afe61383d47a3bca777e206a8a
+++ tests/disallowing_persistence_of_passphrase/__driver__.lua	dd1479635e0685e6e78a0e5fbbd9265494703342
@@ -1,19 +1,17 @@ save_env()
 
 mtn_setup()
 save_env()
 
-unset_env("SSH_AUTH_SOCK")
-
 check(get("persist.lua"))
 
 addfile("input.txt", "version 0 of the file")
 writefile("input.txt", "version 1 of the file")
 
-check(mtn("--branch=testbranch", "--rcfile=persist.lua",
+check(mtn("--ssh-sign=no", "--branch=testbranch", "--rcfile=persist.lua",
           "commit", "--message=blah-blah"),
       1, false, false, "address@hidden")
 
-check(mtn("--branch=testbranch", "--rcfile=persist.lua",
+check(mtn("--ssh-sign=no", "--branch=testbranch", "--rcfile=persist.lua",
           "commit", "--message=blah-blah"),
       0, false, false, string.rep("address@hidden", 4))
 
@@ -23,4 +21,3 @@ check(qgrep("changelog", "stdout"))
 check(qgrep("date", "stdout"))
 check(qgrep("changelog", "stdout"))
 
-restore_env()
============================================================
--- tests/imp_test_filesync_confdir/__driver__.lua	4962a95b8b12e9d65c4efc64781033fed9d088d7
+++ tests/imp_test_filesync_confdir/__driver__.lua	a0c260d405c38adf1a0db939f8b3b0549e442528
@@ -18,8 +18,12 @@ n = 0
 check(mtn("sync", "file:test2.db", "testbranch"), 0, true, false)
 
 n = 0
+
+
+testroot_unix = string.gsub(test.root, '\\', '/')
+
 for line in io.lines("checkfile") do
-   check(line == test.root)
+   check(line == testroot_unix)
    n = n + 1
 end
 check(n == 2)