2 files changed, 27 insertions, 3 deletions
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 99da5a9c6..b9789f88f 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -20,7 +20,7 @@ noinst_PROGRAMS = chkhostname \
   lib556 lib539 lib557 lib560 lib562 lib564 lib565 lib566 lib567 lib568	\
   lib569 lib570 lib571 lib572 lib573 lib582 lib583 lib585 lib586 lib587 \
   lib590 lib591 lib597 lib598 lib599 libauthretry libntlmconnect \
-  lib1500 lib1501 lib1502 lib1503
+  lib1500 lib1501 lib1502 lib1503 lib1504 lib1505
 
 chkhostname_SOURCES = chkhostname.c $(top_srcdir)/lib/curl_gethostname.c
 chkhostname_LDADD = @CURL_NETWORK_LIBS@
@@ -224,6 +224,14 @@ lib1503_SOURCES = lib1502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
 lib1503_LDADD = $(TESTUTIL_LIBS)
 lib1503_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1503
 
+lib1504_SOURCES = lib1502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
+lib1504_LDADD = $(TESTUTIL_LIBS)
+lib1504_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1504
+
+lib1505_SOURCES = lib1502.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
+lib1505_LDADD = $(TESTUTIL_LIBS)
+lib1505_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1505
+
 libauthretry_SOURCES = libauthretry.c $(SUPPORTFILES)
 
 libntlmconnect_SOURCES = libntlmconnect.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c
index 4cf89c4ab..2b50c4733 100644
--- a/tests/libtest/lib1502.c
+++ b/tests/libtest/lib1502.c
@@ -20,6 +20,9 @@
  *
  ***************************************************************************/
 /*
+ * This source code is used for lib1502, lib1503, lib1504 and lib1505 with
+ * only #ifdefs controlling the cleanup sequence.
+ *
  * Test case 1502 converted from bug report #3575448, identifying a memory
  * leak in the CURLOPT_RESOLVE handling with the multi interface.
  */
@@ -108,7 +111,6 @@ test_cleanup:
 
 #ifdef LIB1502
   /* undocumented cleanup sequence - type UA */
-
   curl_multi_cleanup(multi);
   curl_easy_cleanup(easy);
   curl_global_cleanup();
@@ -116,13 +118,27 @@ test_cleanup:
 
 #ifdef LIB1503
   /* proper cleanup sequence - type PA */
-
   curl_multi_remove_handle(multi, easy);
   curl_multi_cleanup(multi);
   curl_easy_cleanup(easy);
   curl_global_cleanup();
 #endif
 
+#ifdef LIB1504
+  /* undocumented cleanup sequence - type UB */
+  curl_easy_cleanup(easy);
+  curl_multi_cleanup(multi);
+  curl_global_cleanup();
+#endif
+
+#ifdef LIB1505
+  /* proper cleanup sequence - type PB */
+  curl_multi_remove_handle(multi, easy);
+  curl_easy_cleanup(easy);
+  curl_multi_cleanup(multi);
+  curl_global_cleanup();
+#endif
+
   curl_slist_free_all(dns_cache_list);
 
   return res;