Commit cd20e81e authored by Kamil Dudka's avatar Kamil Dudka
Browse files

libtest: call PR_Cleanup() on exit if NSPR is used 

This prevents valgrind from reporting possibly lost memory that NSPR
uses for file descriptor cache and other globally allocated internal
data structures.

Reported-by: Štefan Kremeň
parent 79416fb2

tests/libtest/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ if USE_EXPLICIT_LIB_DEPS 
SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@

TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@

else

SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@

TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@

SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@ @NSS_LIBS@

TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@

endif



# Dependencies (may need to be overriden)

tests/libtest/first.c

+14 −1
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ 
#  include <fcntl.h> /* for setmode() */

#endif



#ifdef USE_NSS

#include <nspr.h>

#endif



#ifdef CURLDEBUG

#  define MEMDEBUG_NODEFINES

#  include "memdebug.h"
@@ -128,6 +132,7 @@ char *hexdump(unsigned char *buffer, size_t len) 
int main(int argc, char **argv)

{

  char *URL;

  int result;



#ifdef O_BINARY

#  ifdef __HIGHC__
@@ -166,5 +171,13 @@ int main(int argc, char **argv) 


  fprintf(stderr, "URL: %s\n", URL);



  return test(URL);

  result = test(URL);



#ifdef USE_NSS

  if(PR_Initialized())

    /* prevent valgrind from reporting possibly lost memory (fd cache, ...) */

    PR_Cleanup();

#endif



  return result;

}