James Hawkins : advpack: Remove a test that fails inconsistently on several platforms.

Alexandre Julliard julliard at winehq.org
Mon Apr 21 07:46:07 CDT 2008


Module: wine
Branch: master
Commit: a42f4b654ba405de59757230acb8cbb600f8ecd1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a42f4b654ba405de59757230acb8cbb600f8ecd1

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Fri Apr 18 23:06:25 2008 -0500

advpack: Remove a test that fails inconsistently on several platforms.

---

 dlls/advpack/tests/files.c |   35 -----------------------------------
 1 files changed, 0 insertions(+), 35 deletions(-)

diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c
index e109a88..0f82fa8 100644
--- a/dlls/advpack/tests/files.c
+++ b/dlls/advpack/tests/files.c
@@ -103,36 +103,6 @@ static BOOL check_ini_file_attr(LPSTR filename)
     return ret;
 }
 
-#define FIELD_LEN   16
-
-static BOOL check_ini_contents(LPSTR filename, BOOL add)
-{
-    CHAR field[FIELD_LEN];
-    BOOL ret = TRUE, match;
-
-    GetPrivateProfileStringA("backup", "one", NULL, field, FIELD_LEN, filename);
-    match = !lstrcmpA(field, "-1,0,0,0,0,0,-1");
-    if ((add && !match) || (!add && match)) {
-        trace("first test: got %s\n", field);
-        ret = FALSE;
-    }
-
-    GetPrivateProfileStringA("backup", "two", NULL, field, FIELD_LEN, filename);
-    if (lstrcmpA(field, "-1,0,0,0,0,0,-1")) {
-        trace("second test: got %s\n", field);
-        ret = FALSE;
-    }
-
-    GetPrivateProfileStringA("backup", "three", NULL, field, FIELD_LEN, filename);
-    match = !lstrcmpA(field, "-1,0,0,0,0,0,-1");
-    if ((add && !match) || (!add && match)) {
-        trace("third test: got %s\n", field);
-        ret = FALSE;
-    }
-
-    return ret;
-}
-
 static void test_AddDelBackupEntry(void)
 {
     HRESULT res;
@@ -171,7 +141,6 @@ static void test_AddDelBackupEntry(void)
     res = pAddDelBackupEntry("one\0two\0three\0", "c:\\", "basename", AADBE_ADD_ENTRY);
     ok(res == S_OK, "Expected S_OK, got %d\n", res);
     ok(check_ini_file_attr(path), "Expected ini file to be hidden\n");
-    ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n");
     ok(DeleteFileA(path), "Expected path to exist\n");
 
     lstrcpyA(path, CURR_DIR);
@@ -182,7 +151,6 @@ static void test_AddDelBackupEntry(void)
     res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY);
     ok(res == S_OK, "Expected S_OK, got %d\n", res);
     ok(!check_ini_file_attr(path), "Expected ini file to not be hidden\n");
-    ok(!check_ini_contents(path, TRUE), "Expected ini contents to not match\n");
     ok(!DeleteFileA(path), "Expected path to not exist\n");
 
     /* try an existent, relative backup directory */
@@ -190,7 +158,6 @@ static void test_AddDelBackupEntry(void)
     res = pAddDelBackupEntry("one\0two\0three\0", "backup", "basename", AADBE_ADD_ENTRY);
     ok(res == S_OK, "Expected S_OK, got %d\n", res);
     ok(check_ini_file_attr(path), "Expected ini file to be hidden\n");
-    ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n");
     ok(DeleteFileA(path), "Expected path to exist\n");
     RemoveDirectoryA("backup");
 
@@ -200,14 +167,12 @@ static void test_AddDelBackupEntry(void)
     /* try a NULL backup dir, INI is created in the windows directory */
     res = pAddDelBackupEntry("one\0two\0three\0", NULL, "basename", AADBE_ADD_ENTRY);
     ok(res == S_OK, "Expected S_OK, got %d\n", res);
-    ok(check_ini_contents(path, TRUE), "Expected ini contents to match\n");
 
     /* remove the entries with AADBE_DEL_ENTRY */
     SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL);
     res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY);
     SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL);
     ok(res == S_OK, "Expected S_OK, got %d\n", res);
-    ok(check_ini_contents(path, FALSE), "Expected ini contents to match\n");
     ok(DeleteFileA(path), "Expected path to exist\n");
 }
 




More information about the wine-cvs mailing list