Alexandre Julliard : kernel32/tests: Fixed the pipe test for MacOS.
Module: wine Branch: master Commit: 91bb29ca4d84b80551fce257dee5392a96108619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bb29ca4d84b80551fce257de... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 15:40:36 2006 +0100 kernel32/tests: Fixed the pipe test for MacOS. --- dlls/kernel32/tests/pipe.c | 53 ++++++++++++++++++++++++++++--------------- 1 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index c956e75..9701939 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -129,22 +129,25 @@ static void test_CreateNamedPipe(int pip ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - /* should return all 23 bytes */ + if (readden != sizeof(obuf)) /* Linux only returns the first message */ ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); - } + else + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); } else - ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + { + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ + ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + } if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 3a check\n"); - if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - pbuf += sizeof(obuf); - ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 3b check\n"); - } + if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { + pbuf += sizeof(obuf); + ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 3b check\n"); } ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf) + sizeof(obuf2), "read 3 got %d bytes\n", readden); @@ -161,22 +164,26 @@ static void test_CreateNamedPipe(int pip ok(written == sizeof(obuf2), "write file len 4b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { + if (readden != sizeof(obuf)) /* Linux only returns the first message */ /* should return all 23 bytes */ ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); - } + else + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); } else - ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + { + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ + ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + } if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 4a check\n"); - if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - pbuf += sizeof(obuf); - ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 4b check\n"); - } + if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { + pbuf += sizeof(obuf); + ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 4b check\n"); } ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); if (pipemode == PIPE_TYPE_BYTE) { @@ -212,9 +219,14 @@ static void test_CreateNamedPipe(int pip ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); - ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ + ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); + else + todo_wine ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); @@ -243,7 +255,10 @@ static void test_CreateNamedPipe(int pip ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile6b\n"); ok(written == sizeof(obuf2), "write file len 6b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n"); - ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ + ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); pbuf = ibuf;
participants (1)
-
Alexandre Julliard