# # # patch "tests/automate_heads/__driver__.lua" # from [388eb896ee29c7d14a5294ebafbc60b43faa1bef] # to [7b00f82a3172485381d6845352d14c1eacc29b3e] # # patch "tests/can_execute_things/__driver__.lua" # from [d011bd5b0f3f446bd537e8a096ba9939014bc49b] # to [7e946cf7d485ac9ab5cb9d231a3d544a4a555292] # # patch "tests/can_execute_things/win-cphook.lua" # from [1bb87b17c4d7d4d168642e31f3a7999a8806bae8] # to [395e152fb996b50d8f71469f6deb75c5c55a8030] # # patch "tests/commit_validation_lua_hook/__driver__.lua" # from [66264652b87eb7429c905ba75b193ac3ef0d69e8] # to [8d908341efb7b63c728bafb62d002157d01647dd] # # patch "tests/vars/__driver__.lua" # from [17630a0ac1fac4a75582a73063d987c6b4442502] # to [9e2b7c6aaebfefcf231705aaade440ca8c274eb4] # # patch "testsuite.lua" # from [ab6fffa4c9d0bf6564bb073298e59f0e016c9d0e] # to [91d769df7d4261ec468ef74c45d589f9f6376fc9] # ============================================================ --- tests/automate_heads/__driver__.lua 388eb896ee29c7d14a5294ebafbc60b43faa1bef +++ tests/automate_heads/__driver__.lua 7b00f82a3172485381d6845352d14c1eacc29b3e @@ -14,6 +14,7 @@ end table.sort(revs) for _,x in ipairs(revs) do append("wanted_heads", x.."\n") end +canonicalize("wanted_heads") check(mtn("automate", "heads", "testbranch"), 0, true, false) ============================================================ --- tests/can_execute_things/__driver__.lua d011bd5b0f3f446bd537e8a096ba9939014bc49b +++ tests/can_execute_things/__driver__.lua 7e946cf7d485ac9ab5cb9d231a3d544a4a555292 @@ -1,7 +1,10 @@ if existsonpath("cp") then getfile("nix-cphook.lua", "cphook.lua") elseif existsonpath("xcopy") then + -- This actually copies it to testfile.copied/testfile, + -- but that still makes testfile.copied exists. So it's + -- not exactly the same as the other hook, but it works. getfile("win-cphook.lua", "cphook.lua") else skip_if(true) ============================================================ --- tests/can_execute_things/win-cphook.lua 1bb87b17c4d7d4d168642e31f3a7999a8806bae8 +++ tests/can_execute_things/win-cphook.lua 395e152fb996b50d8f71469f6deb75c5c55a8030 @@ -1,7 +1,7 @@ function note_commit(new_id, certs) local pid local ret = -1 - pid = spawn("xcopy", "testfile", "testfile.copied") + pid = spawn("xcopy", "testfile", "testfile.copied\\") if (pid == -1) then return nil end ============================================================ --- tests/commit_validation_lua_hook/__driver__.lua 66264652b87eb7429c905ba75b193ac3ef0d69e8 +++ tests/commit_validation_lua_hook/__driver__.lua 8d908341efb7b63c728bafb62d002157d01647dd @@ -8,5 +8,6 @@ check(mtn("add", "input.txt"), 0, false, false) getfile("errmsg") check(mtn("--branch=testbranch", "--rcfile=commit_validate.lua", "commit", "-m", "denyme"), 1, false, true) +canonicalize("stderr") check(samefile("errmsg", "stderr")) check(mtn("--branch=testbranch", "--rcfile=commit_validate.lua", "commit", "-m", "allowme"), 0, false, false) ============================================================ --- tests/vars/__driver__.lua 17630a0ac1fac4a75582a73063d987c6b4442502 +++ tests/vars/__driver__.lua 9e2b7c6aaebfefcf231705aaade440ca8c274eb4 @@ -15,6 +15,9 @@ writefile("domain2_vars", "domain2: key1 other_domain_value\n") check(cat("domain1_vars", "domain2_vars"), 0, true) rename("stdout", "all_vars") +canonicalize("domain1_vars") +canonicalize("domain2_vars") +canonicalize("all_vars") check(mtn("ls", "vars"), 0, true, false) canonicalize("stdout") ============================================================ --- testsuite.lua ab6fffa4c9d0bf6564bb073298e59f0e016c9d0e +++ testsuite.lua 91d769df7d4261ec468ef74c45d589f9f6376fc9 @@ -18,14 +18,14 @@ else char = ':' end - local now = initial_dir.."/"..exe + local now = initial_dir.."/"..exe..".exe" if exists(now) then return gotit(now) end for x in string.gfind(path, "[^"..char.."]*"..char) do local dir = string.sub(x, 0, -2) if string.find(dir, "[\\/]$") then dir = string.sub(dir, 0, -2) end - local now = dir.."/"..exe + local now = dir.."/"..exe..".exe" if exists(now) then return gotit(now) end end if test_log == nil then