Hans Leidekker : msi/tests: Try harder to remove a shortcut file.
Alexandre Julliard
julliard at winehq.org
Tue Dec 6 15:46:19 CST 2011
Module: wine
Branch: master
Commit: 75242afefd21935a2923a24faf1ca2719a27376b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=75242afefd21935a2923a24faf1ca2719a27376b
Author: Hans Leidekker <hans at codeweavers.com>
Date: Tue Dec 6 13:13:33 2011 +0100
msi/tests: Try harder to remove a shortcut file.
---
dlls/msi/tests/install.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c
index 7c74e66..8e4e4b7 100644
--- a/dlls/msi/tests/install.c
+++ b/dlls/msi/tests/install.c
@@ -5335,19 +5335,19 @@ static void test_shortcut(void)
CoUninitialize();
- delete_pf("msitest\\cabout\\new\\five.txt", TRUE);
- delete_pf("msitest\\cabout\\new", FALSE);
- delete_pf("msitest\\cabout\\four.txt", TRUE);
- delete_pf("msitest\\cabout", FALSE);
- delete_pf("msitest\\changed\\three.txt", TRUE);
- delete_pf("msitest\\changed", FALSE);
- delete_pf("msitest\\first\\two.txt", TRUE);
- delete_pf("msitest\\first", FALSE);
- delete_pf("msitest\\filename", TRUE);
- delete_pf("msitest\\one.txt", TRUE);
- delete_pf("msitest\\service.exe", TRUE);
- delete_pf("msitest\\Shortcut.lnk", TRUE);
- delete_pf("msitest", FALSE);
+ ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n");
+ ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n");
+ ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n");
+ ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\first", FALSE), "Directory not created\n");
+ ok(delete_pf("msitest\\filename", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n");
+ ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n");
+ while (!delete_pf("msitest\\Shortcut.lnk", TRUE) && GetLastError() == ERROR_SHARING_VIOLATION) Sleep(1000);
+ ok(delete_pf("msitest", FALSE), "Directory not created\n");
error:
delete_test_files();
More information about the wine-cvs
mailing list