# # # patch "tests/key_files_deleted_securely/__driver__.lua" # from [5ebce927330de357100e56fa2e6843d4adc3081f] # to [32c966ddf01fecc55953f88f23d934da87de1abd] # # patch "tests/serve-automate/__driver__.lua" # from [471fb37e8ea44cecb4289711f70bdfd0bdda5ba8] # to [57e8ccc98c7ae0cc8d380d1fbc2232af5082db87] # # patch "tests/serve-automate-single-run/__driver__.lua" # from [1f71db3bb9826760579ee0666105d1fa66e55916] # to [da26b84d7889323d4cc960803a3e3037110533ec] # # patch "tests/validate_changes_hook/__driver__.lua" # from [e4b265408e42602391da60d4899afdccf0c8a720] # to [5dcabaedf9f1f6097a9391d74ffbdc4e8f3d78ab] # # patch "tests/validate_changes_hook/commit_validate.lua" # from [b209468070d62f65c61a3c08735189c075493bd5] # to [b3dcd4f949c7d567895b85486c5e039a71dbe9dd] # ============================================================ --- tests/key_files_deleted_securely/__driver__.lua 5ebce927330de357100e56fa2e6843d4adc3081f +++ tests/key_files_deleted_securely/__driver__.lua 32c966ddf01fecc55953f88f23d934da87de1abd @@ -6,13 +6,13 @@ line = readfile("stdout") check(mtn("genkey", "foobar"), 0, false, true, "\n\n") check(grep("has hash", "stderr"), 0, true) line = readfile("stdout") -keyid1 = string.sub(line, -42, -3) +keyid1 = string.sub(line, 29, 68) check(rename("keys/foobar."..keyid1, "keys/something-else")) check(mtn("genkey", "foobar", "--force-duplicate-key"), 0, false, true, "\n\n") check(grep("has hash", "stderr"), 0, true) line = readfile("stdout") -keyid2 = string.sub(line, -42, -3) +keyid2 = string.sub(line, 29, 68) check(rename("keys/foobar."..keyid2, "keys/foobar")) check(mtn("dropkey", keyid1), 1, false, true) ============================================================ --- tests/serve-automate/__driver__.lua 471fb37e8ea44cecb4289711f70bdfd0bdda5ba8 +++ tests/serve-automate/__driver__.lua 57e8ccc98c7ae0cc8d380d1fbc2232af5082db87 @@ -53,6 +53,10 @@ copy("allow-automate.lua", "custom_test_ copy("allow-automate.lua", "custom_test_hooks.lua") +if ostype ~= "Windows" then +-- 'file:' not supported on Windows + check(mtn2("automate", "remote_stdio", "file://" .. test.root .. "/test.db"), 0, true, false, "l17:interface_versione") -check(parse_stdio(readfile("stdout"), 0, 0, "m") ~= nil) \ No newline at end of file +check(parse_stdio(readfile("stdout"), 0, 0, "m") ~= nil) +end ============================================================ --- tests/serve-automate-single-run/__driver__.lua 1f71db3bb9826760579ee0666105d1fa66e55916 +++ tests/serve-automate-single-run/__driver__.lua da26b84d7889323d4cc960803a3e3037110533ec @@ -56,8 +56,12 @@ server:stop() server:stop() +if ostype ~= "Windows" then +-- 'file:' not supported on Windows + copy("allow-automate.lua", "custom_test_hooks.lua") check(mtn2("automate", "remote", "--remote-stdio-host", "file://"..test.root.."/test.db", "get_file_of", "--", "-r".. R1, "foo"), 0, true, false) check(qgrep("bar", "stdout")) +end ============================================================ --- tests/validate_changes_hook/__driver__.lua e4b265408e42602391da60d4899afdccf0c8a720 +++ tests/validate_changes_hook/__driver__.lua 5dcabaedf9f1f6097a9391d74ffbdc4e8f3d78ab @@ -4,8 +4,9 @@ check(get("errmsg")) check(get("commit_validate.lua")) check(get("errmsg")) -addfile("test", "this is a\r\ntest") +addfile("test", "this is a\012\013test") check(mtn("--rcfile=commit_validate.lua", "commit", "-m", "foo"), 1, false, true) +canonicalize("stderr") check(samefile("errmsg", "stderr")) writefile("test", "this is a\ntest") ============================================================ --- tests/validate_changes_hook/commit_validate.lua b209468070d62f65c61a3c08735189c075493bd5 +++ tests/validate_changes_hook/commit_validate.lua b3dcd4f949c7d567895b85486c5e039a71dbe9dd @@ -8,7 +8,7 @@ function validate_changes(revdata, branc local fp = assert(io.open(file, "r")) local contents = fp:read("*all") fp:close() - if string.find(contents, "\r\n") then + if string.find(contents, "\012\013") then return false, "CRLF detected" end end