Add trailing '\n's to ok() calls (kernel 6)
Francois Gouget
fgouget at free.fr
Sat Jan 24 13:55:48 CST 2004
Changelog:
* dlls/kernel/tests/drive.c
Add trailing '\n's to ok() calls.
Index: dlls/kernel/tests/directory.c
===================================================================
RCS file: /home/cvs/wine/dlls/kernel/tests/directory.c,v
retrieving revision 1.8
diff -u -r1.8 directory.c
--- dlls/kernel/tests/directory.c 8 Dec 2003 22:20:25 -0000 1.8
+++ dlls/kernel/tests/directory.c 23 Jan 2004 12:41:13 -0000
@@ -34,23 +34,23 @@
char buf[MAX_PATH];
len_with_null = GetWindowsDirectoryA(NULL, 0);
- ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH");
+ ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH\n");
lstrcpyA(buf, "foo");
len_with_null = GetWindowsDirectoryA(buf, 1);
- ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer");
+ ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n");
lstrcpyA(buf, "foo");
len = GetWindowsDirectoryA(buf, len_with_null - 1);
- ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer");
- ok(len == len_with_null, "GetWindowsDirectoryW returned %d, expected %d",
+ ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n");
+ ok(len == len_with_null, "GetWindowsDirectoryW returned %d, expected %d\n",
len, len_with_null);
lstrcpyA(buf, "foo");
len = GetWindowsDirectoryA(buf, len_with_null);
- ok(lstrcmpA(buf, "foo") != 0, "should touch the buffer");
- ok(len == strlen(buf), "returned length should be equal to the length of string");
- ok(len == len_with_null-1, "GetWindowsDirectoryA returned %d, expected %d",
+ ok(lstrcmpA(buf, "foo") != 0, "should touch the buffer\n");
+ ok(len == strlen(buf), "returned length should be equal to the length of string\n");
+ ok(len == len_with_null-1, "GetWindowsDirectoryA returned %d, expected %d\n",
len, len_with_null-1);
}
@@ -63,25 +63,25 @@
len_with_null = GetWindowsDirectoryW(NULL, 0);
if (len_with_null==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
- ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH");
+ ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH\n");
lstrcpyW(buf, fooW);
len = GetWindowsDirectoryW(buf, 1);
- ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer");
- ok(len == len_with_null, "GetWindowsDirectoryW returned %d, expected %d",
+ ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n");
+ ok(len == len_with_null, "GetWindowsDirectoryW returned %d, expected %d\n",
len, len_with_null);
lstrcpyW(buf, fooW);
len = GetWindowsDirectoryW(buf, len_with_null - 1);
- ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer");
- ok(len == len_with_null, "GetWindowsDirectoryW returned %d, expected %d",
+ ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n");
+ ok(len == len_with_null, "GetWindowsDirectoryW returned %d, expected %d\n",
len, len_with_null);
lstrcpyW(buf, fooW);
len = GetWindowsDirectoryW(buf, len_with_null);
- ok(lstrcmpW(buf, fooW) != 0, "should touch the buffer");
- ok(len == lstrlenW(buf), "returned length should be equal to the length of string");
- ok(len == len_with_null-1, "GetWindowsDirectoryW returned %d, expected %d",
+ ok(lstrcmpW(buf, fooW) != 0, "should touch the buffer\n");
+ ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n");
+ ok(len == len_with_null-1, "GetWindowsDirectoryW returned %d, expected %d\n",
len, len_with_null-1);
}
@@ -95,25 +95,25 @@
char buf[MAX_PATH];
len_with_null = GetSystemDirectoryA(NULL, 0);
- ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH");
+ ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH\n");
lstrcpyA(buf, "foo");
len = GetSystemDirectoryA(buf, 1);
- ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer");
- ok(len == len_with_null, "GetSystemDirectoryA returned %d, expected %d",
+ ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n");
+ ok(len == len_with_null, "GetSystemDirectoryA returned %d, expected %d\n",
len, len_with_null);
lstrcpyA(buf, "foo");
len = GetSystemDirectoryA(buf, len_with_null - 1);
- ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer");
- ok(len == len_with_null, "GetSystemDirectoryA returned %d, expected %d",
+ ok(lstrcmpA(buf, "foo") == 0, "should not touch the buffer\n");
+ ok(len == len_with_null, "GetSystemDirectoryA returned %d, expected %d\n",
len, len_with_null);
lstrcpyA(buf, "foo");
len = GetSystemDirectoryA(buf, len_with_null);
- ok(lstrcmpA(buf, "foo") != 0, "should touch the buffer");
- ok(len == strlen(buf), "returned length should be equal to the length of string");
- ok(len == len_with_null-1, "GetSystemDirectoryW returned %d, expected %d",
+ ok(lstrcmpA(buf, "foo") != 0, "should touch the buffer\n");
+ ok(len == strlen(buf), "returned length should be equal to the length of string\n");
+ ok(len == len_with_null-1, "GetSystemDirectoryW returned %d, expected %d\n",
len, len_with_null-1);
}
@@ -126,25 +126,25 @@
len_with_null = GetSystemDirectoryW(NULL, 0);
if (len_with_null==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
- ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH");
+ ok(len_with_null <= MAX_PATH, "should fit into MAX_PATH\n");
lstrcpyW(buf, fooW);
len = GetSystemDirectoryW(buf, 1);
- ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer");
- ok(len == len_with_null, "GetSystemDirectoryW returned %d, expected %d",
+ ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n");
+ ok(len == len_with_null, "GetSystemDirectoryW returned %d, expected %d\n",
len, len_with_null);
lstrcpyW(buf, fooW);
len = GetSystemDirectoryW(buf, len_with_null - 1);
- ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer");
- ok(len == len_with_null, "GetSystemDirectoryW returned %d, expected %d",
+ ok(lstrcmpW(buf, fooW) == 0, "should not touch the buffer\n");
+ ok(len == len_with_null, "GetSystemDirectoryW returned %d, expected %d\n",
len, len_with_null);
lstrcpyW(buf, fooW);
len = GetSystemDirectoryW(buf, len_with_null);
- ok(lstrcmpW(buf, fooW) != 0, "should touch the buffer");
- ok(len == lstrlenW(buf), "returned length should be equal to the length of string");
- ok(len == len_with_null-1, "GetSystemDirectoryW returned %d, expected %d",
+ ok(lstrcmpW(buf, fooW) != 0, "should touch the buffer\n");
+ ok(len == lstrlenW(buf), "returned length should be equal to the length of string\n");
+ ok(len == len_with_null-1, "GetSystemDirectoryW returned %d, expected %d\n",
len, len_with_null-1);
}
@@ -156,55 +156,55 @@
ret = CreateDirectoryA(NULL, NULL);
ok(ret == FALSE && (GetLastError() == ERROR_PATH_NOT_FOUND ||
GetLastError() == ERROR_INVALID_PARAMETER),
- "CreateDirectoryA(NULL,NULL): ret=%d error=%ld",ret,GetLastError());
+ "CreateDirectoryA(NULL,NULL): ret=%d error=%ld\n",ret,GetLastError());
ret = CreateDirectoryA("", NULL);
ok(ret == FALSE && (GetLastError() == ERROR_BAD_PATHNAME ||
GetLastError() == ERROR_PATH_NOT_FOUND),
- "CreateDirectoryA(\"\",NULL): ret=%d error=%ld",ret,GetLastError());
+ "CreateDirectoryA(\"\",NULL): ret=%d error=%ld\n",ret,GetLastError());
ret = GetSystemDirectoryA(tmpdir, MAX_PATH);
- ok(ret < MAX_PATH, "System directory should fit into MAX_PATH");
+ ok(ret < MAX_PATH, "System directory should fit into MAX_PATH\n");
ret = SetCurrentDirectoryA(tmpdir);
- ok(ret == TRUE, "could not chdir to the System directory");
+ ok(ret == TRUE, "could not chdir to the System directory\n");
ret = CreateDirectoryA(".", NULL);
- ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path");
+ ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path\n");
ret = CreateDirectoryA("..", NULL);
- ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path");
+ ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path\n");
GetTempPathA(MAX_PATH, tmpdir);
tmpdir[3] = 0; /* truncate the path */
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == FALSE && (GetLastError() == ERROR_ALREADY_EXISTS ||
GetLastError() == ERROR_ACCESS_DENIED),
- "CreateDirectoryA(drive_root): ret=%d error=%ld",ret,GetLastError());
+ "CreateDirectoryA(drive_root): ret=%d error=%ld\n",ret,GetLastError());
GetTempPathA(MAX_PATH, tmpdir);
lstrcatA(tmpdir, "Please Remove Me");
ret = CreateDirectoryA(tmpdir, NULL);
- ok(ret == TRUE, "CreateDirectoryA should always succeed");
+ ok(ret == TRUE, "CreateDirectoryA should always succeed\n");
ret = CreateDirectoryA(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path");
+ ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path\n");
ret = RemoveDirectoryA(tmpdir);
- ok(ret == TRUE, "RemoveDirectoryA should always succeed");
+ ok(ret == TRUE, "RemoveDirectoryA should always succeed\n");
todo_wine {
lstrcatA(tmpdir, "?");
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryA with ? wildcard name should fail, ret=%s error=%ld",
+ "CreateDirectoryA with ? wildcard name should fail, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
ret = RemoveDirectoryA(tmpdir);
tmpdir[lstrlenA(tmpdir) - 1] = '*';
ret = CreateDirectoryA(tmpdir, NULL);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryA with * wildcard name should fail, ret=%s error=%ld",
+ "CreateDirectoryA with * wildcard name should fail, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
ret = RemoveDirectoryA(tmpdir);
}
@@ -223,51 +223,51 @@
ret = CreateDirectoryW(NULL, NULL);
if (!ret && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
- ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, "should not create NULL path");
+ ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, "should not create NULL path\n");
ret = CreateDirectoryW(empty_strW, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, "should not create empty path");
+ ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, "should not create empty path\n");
ret = GetSystemDirectoryW(tmpdir, MAX_PATH);
- ok(ret < MAX_PATH, "System directory should fit into MAX_PATH");
+ ok(ret < MAX_PATH, "System directory should fit into MAX_PATH\n");
ret = SetCurrentDirectoryW(tmpdir);
- ok(ret == TRUE, "could not chdir to the System directory");
+ ok(ret == TRUE, "could not chdir to the System directory\n");
ret = CreateDirectoryW(dotW, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path");
+ ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path\n");
ret = CreateDirectoryW(dotdotW, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path");
+ ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path\n");
GetTempPathW(MAX_PATH, tmpdir);
tmpdir[3] = 0; /* truncate the path */
ret = CreateDirectoryW(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_ACCESS_DENIED, "should deny access to the drive root");
+ ok(ret == FALSE && GetLastError() == ERROR_ACCESS_DENIED, "should deny access to the drive root\n");
GetTempPathW(MAX_PATH, tmpdir);
lstrcatW(tmpdir, tmp_dir_name);
ret = CreateDirectoryW(tmpdir, NULL);
- ok(ret == TRUE, "CreateDirectoryW should always succeed");
+ ok(ret == TRUE, "CreateDirectoryW should always succeed\n");
ret = CreateDirectoryW(tmpdir, NULL);
- ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path");
+ ok(ret == FALSE && GetLastError() == ERROR_ALREADY_EXISTS, "should not create existing path\n");
ret = RemoveDirectoryW(tmpdir);
- ok(ret == TRUE, "RemoveDirectoryW should always succeed");
+ ok(ret == TRUE, "RemoveDirectoryW should always succeed\n");
todo_wine {
lstrcatW(tmpdir, questionW);
ret = CreateDirectoryW(tmpdir, NULL);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryW with ? wildcard name should fail with error 183, ret=%s error=%ld",
+ "CreateDirectoryW with ? wildcard name should fail with error 183, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
ret = RemoveDirectoryW(tmpdir);
tmpdir[lstrlenW(tmpdir) - 1] = '*';
ret = CreateDirectoryW(tmpdir, NULL);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "CreateDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld",
+ "CreateDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
ret = RemoveDirectoryW(tmpdir);
}
@@ -281,22 +281,22 @@
GetTempPathA(MAX_PATH, tmpdir);
lstrcatA(tmpdir, "Please Remove Me");
ret = CreateDirectoryA(tmpdir, NULL);
- ok(ret == TRUE, "CreateDirectoryA should always succeed");
+ ok(ret == TRUE, "CreateDirectoryA should always succeed\n");
ret = RemoveDirectoryA(tmpdir);
- ok(ret == TRUE, "RemoveDirectoryA should always succeed");
+ ok(ret == TRUE, "RemoveDirectoryA should always succeed\n");
todo_wine {
lstrcatA(tmpdir, "?");
ret = RemoveDirectoryA(tmpdir);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryA with ? wildcard name should fail with error 183, ret=%s error=%ld",
+ "RemoveDirectoryA with ? wildcard name should fail with error 183, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
tmpdir[lstrlenA(tmpdir) - 1] = '*';
ret = RemoveDirectoryA(tmpdir);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryA with * wildcard name should fail with error 183, ret=%s error=%ld",
+ "RemoveDirectoryA with * wildcard name should fail with error 183, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
}
}
@@ -314,22 +314,22 @@
if (!ret && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED)
return;
- ok(ret == TRUE, "CreateDirectoryW should always succeed");
+ ok(ret == TRUE, "CreateDirectoryW should always succeed\n");
ret = RemoveDirectoryW(tmpdir);
- ok(ret == TRUE, "RemoveDirectoryW should always succeed");
+ ok(ret == TRUE, "RemoveDirectoryW should always succeed\n");
todo_wine {
lstrcatW(tmpdir, questionW);
ret = RemoveDirectoryW(tmpdir);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryW with wildcard should fail with error 183, ret=%s error=%ld",
+ "RemoveDirectoryW with wildcard should fail with error 183, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
tmpdir[lstrlenW(tmpdir) - 1] = '*';
ret = RemoveDirectoryW(tmpdir);
ok(ret == FALSE && GetLastError() == ERROR_INVALID_NAME,
- "RemoveDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld",
+ "RemoveDirectoryW with * wildcard name should fail with error 183, ret=%s error=%ld\n",
ret ? " True" : "False", GetLastError());
}
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
RFC 2549: ftp://ftp.isi.edu/in-notes/rfc2549.txt
IP over Avian Carriers with Quality of Service
More information about the wine-patches
mailing list