From 034765e1000602f0b14dc12a267eb194ee974517 Mon Sep 17 00:00:00 2001
From: Paul Vriens <paul.vriens.wine@gmail.com>
Date: Mon, 12 Mar 2007 09:16:06 +0100
Subject: [PATCH] dnsapi/tests: Load dnsapi dynamically and use skip.

---
 dlls/dnsapi/tests/Makefile.in | 2 +-
 dlls/dnsapi/tests/name.c      | 8 +++++++-
 dlls/dnsapi/tests/record.c    | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dlls/dnsapi/tests/Makefile.in b/dlls/dnsapi/tests/Makefile.in
index 25edc4acd86..5c86a66572a 100644
--- a/dlls/dnsapi/tests/Makefile.in
+++ b/dlls/dnsapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = dnsapi.dll
-IMPORTS   = dnsapi kernel32
+IMPORTS   = kernel32
 
 CTESTS = \
 	name.c \
diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c
index d59e19e7f84..5d74bddde1e 100644
--- a/dlls/dnsapi/tests/name.c
+++ b/dlls/dnsapi/tests/name.c
@@ -219,10 +219,16 @@ static void test_DnsNameCompare_A( void )
 START_TEST(name)
 {
     dnsapi = LoadLibraryA( "dnsapi.dll" );
-    if (!dnsapi) return;
+    if (!dnsapi)
+    {
+        /* Doesn't exist before W2K */
+        skip("dnsapi.dll cannot be loaded\n");
+        return;
+    }
 
     if (!init_function_ptrs())
     {
+        skip("Needed functions are not available\n");
         FreeLibrary( dnsapi );
         return;
     }
diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c
index 7da1c295996..ee7df92ab72 100644
--- a/dlls/dnsapi/tests/record.c
+++ b/dlls/dnsapi/tests/record.c
@@ -150,10 +150,16 @@ static void test_DnsRecordSetDetach( void )
 START_TEST(record)
 {
     dnsapi = LoadLibraryA( "dnsapi.dll" );
-    if (!dnsapi) return;
+    if (!dnsapi)
+    {
+        /* Doesn't exist before W2K */
+        skip("dnsapi.dll cannot be loaded\n");
+        return;
+    }
 
     if (!init_function_ptrs())
     {
+        skip("Needed functions are not available\n");
         FreeLibrary( dnsapi );
         return;
     }
-- 
2.11.4.GIT