Module: wine Branch: master Commit: d9ffbe4e82d1f9108487a3f40c194a0819ed4c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ffbe4e82d1f9108487a3f40c...
Author: Francois Gouget fgouget@free.fr Date: Tue May 19 11:21:38 2009 +0200
msi/tests: Use win_skip() to skip over unimplemented functionality.
---
dlls/msi/tests/install.c | 4 ++-- dlls/msi/tests/msi.c | 10 +++++----- dlls/msi/tests/source.c | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3500007..933a145 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3322,7 +3322,7 @@ static void test_publish(void)
if (!pMsiQueryComponentStateA) { - skip("MsiQueryComponentStateA is not available\n"); + win_skip("MsiQueryComponentStateA is not available\n"); return; }
@@ -3810,7 +3810,7 @@ static void test_publishsourcelist(void)
if (!pMsiSourceListEnumSourcesA || !pMsiSourceListGetInfoA) { - skip("MsiSourceListEnumSourcesA and/or MsiSourceListGetInfoA are not available\n"); + win_skip("MsiSourceListEnumSourcesA and/or MsiSourceListGetInfoA are not available\n"); return; }
diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index c3ef72b..fdbb253 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -190,7 +190,7 @@ static void test_usefeature(void)
if (!pMsiUseFeatureExA) { - skip("MsiUseFeatureExA not implemented\n"); + win_skip("MsiUseFeatureExA not implemented\n"); return; }
@@ -408,7 +408,7 @@ static void test_MsiGetFileHash(void)
if (!pMsiGetFileHashA) { - skip("MsiGetFileHash not implemented\n"); + win_skip("MsiGetFileHash not implemented\n"); return; }
@@ -1221,7 +1221,7 @@ static void test_MsiQueryComponentState(void)
if (!pMsiQueryComponentStateA) { - skip("MsiQueryComponentStateA not implemented\n"); + win_skip("MsiQueryComponentStateA not implemented\n"); return; }
@@ -3864,7 +3864,7 @@ static void test_MsiGetProductInfoEx(void)
if (!pMsiGetProductInfoExA) { - skip("MsiGetProductInfoExA is not available\n"); + win_skip("MsiGetProductInfoExA is not available\n"); return; }
@@ -10958,7 +10958,7 @@ START_TEST(msi) test_MsiGetFileHash();
if (!pConvertSidToStringSidA) - skip("ConvertSidToStringSidA not implemented\n"); + win_skip("ConvertSidToStringSidA not implemented\n"); else { /* These tests rely on get_user_sid that needs ConvertSidToStringSidA */ diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 2e9e3ff..4e94eda 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -193,7 +193,7 @@ static void test_MsiSourceListGetInfo(void)
if (!pMsiSourceListGetInfoA) { - skip("Skipping MsiSourceListGetInfoA tests\n"); + win_skip("Skipping MsiSourceListGetInfoA tests\n"); return; }
@@ -645,7 +645,7 @@ static void test_MsiSourceListAddSourceEx(void)
if (!pMsiSourceListAddSourceExA) { - skip("Skipping MsiSourceListAddSourceExA tests\n"); + win_skip("Skipping MsiSourceListAddSourceExA tests\n"); return; }
@@ -1018,7 +1018,7 @@ static void test_MsiSourceListEnumSources(void)
if (!pMsiSourceListEnumSourcesA) { - skip("MsiSourceListEnumSourcesA is not available\n"); + win_skip("MsiSourceListEnumSourcesA is not available\n"); return; }
@@ -1620,7 +1620,7 @@ static void test_MsiSourceListSetInfo(void)
if (!pMsiSourceListSetInfoA) { - skip("MsiSourceListSetInfoA is not available\n"); + win_skip("MsiSourceListSetInfoA is not available\n"); return; }
@@ -2030,7 +2030,7 @@ static void test_MsiSourceListAddMediaDisk(void)
if (!pMsiSourceListAddMediaDiskA) { - skip("MsiSourceListAddMediaDiskA is not available\n"); + win_skip("MsiSourceListAddMediaDiskA is not available\n"); return; }
@@ -2332,7 +2332,7 @@ static void test_MsiSourceListEnumMediaDisks(void)
if (!pMsiSourceListEnumMediaDisksA) { - skip("MsiSourceListEnumMediaDisksA is not available\n"); + win_skip("MsiSourceListEnumMediaDisksA is not available\n"); return; }
@@ -3131,7 +3131,7 @@ static void test_MsiSourceListAddSource(void)
if (!pMsiSourceListAddSourceA) { - skip("Skipping MsiSourceListAddSourceA tests\n"); + win_skip("Skipping MsiSourceListAddSourceA tests\n"); return; }