# # # patch "tester.cc" # from [a25b181d8d90f25ddb019673decde4ab01eb921f] # to [6990cf999039ad1eaa03ec5c511fd58ac72aebd0] # # patch "tester.lua" # from [2652b5718374679f2026bc9d8e85051e88018931] # to [489d8c494f46c2551a81250c0a0b0b80d06eb493] # # patch "testsuite.lua" # from [8a7a8643419cbeb1bffacb3c2b00bd28f5e4febf] # to [2a2858f3b1990fcccc8e74bc0d9a04ddc8f9c179] # # patch "win32/process.cc" # from [cd470989510d05f0a9e619b880183df66b5df6f3] # to [9a22bd0656f2a33b3f73091245f8e2cb54993d81] # ============================================================ --- tester.cc a25b181d8d90f25ddb019673decde4ab01eb921f +++ tester.cc 6990cf999039ad1eaa03ec5c511fd58ac72aebd0 @@ -57,7 +57,7 @@ { file = CreateFile(where.c_str(), GENERIC_WRITE, - 0, + FILE_SHARE_READ, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, ============================================================ --- tester.lua 2652b5718374679f2026bc9d8e85051e88018931 +++ tester.lua 489d8c494f46c2551a81250c0a0b0b80d06eb493 @@ -366,7 +366,7 @@ out.expret = ret out.expout = stdout out.experr = stderr - L(out.locstr, "starting background command: ", table.concat(out.cmd, " ")) + L(out.locstr, "starting background command: ", table.concat(out.cmd, " "), "\n") local mt = {} mt.__index = mt mt.finish = function(obj, timeout) @@ -382,7 +382,7 @@ obj.retval = obj.process:wait() table.remove(bglist, obj.id) L(locheader(), "checking background command from ", out.locstr, - table.concat(out.cmd, " ")) + table.concat(out.cmd, " "), "\n") post_cmd(obj.retval, out.expret, out.expout, out.experr, obj.prefix) end return setmetatable(out, mt) ============================================================ --- testsuite.lua 8a7a8643419cbeb1bffacb3c2b00bd28f5e4febf +++ testsuite.lua 2a2858f3b1990fcccc8e74bc0d9a04ddc8f9c179 @@ -175,7 +175,7 @@ -- maybe this one should go in tester.lua? function check_same_stdout(cmd1, cmd2) check(cmd1, 0, true, false) - rename("stdout", "stdout-first") + rename_over("stdout", "stdout-first") check(cmd2, 0, true, false) check(samefile("stdout", "stdout-first")) end ============================================================ --- win32/process.cc cd470989510d05f0a9e619b880183df66b5df6f3 +++ win32/process.cc 9a22bd0656f2a33b3f73091245f8e2cb54993d81 @@ -147,7 +147,7 @@ int process_wait(pid_t pid, int *res, int timeout) { HANDLE hProcess = (HANDLE)pid; - DWORD time = INFINITE + DWORD time = INFINITE; if (timeout != -1) time = timeout * 1000; DWORD r = WaitForSingleObject(hProcess, time);