Merge pull request #133 from ibm-genwqe/more_zlib_tests

More zlib tests

Makefile

@@ -39,7 +39,7 @@ PLATFORM ?= $(shell uname -i)
 
 distro = $(shell lsb_release -d | cut -f2)
 
-subdirs += lib tools
+subdirs += lib tools misc
 
 ifdef WITH_LIBCXL
 subdirs += init
@@ -51,7 +51,7 @@ MODPROBE_D ?= /etc/modprobe.d
 all: $(subdirs)
 
 # Rules for the recursive build
-tools: lib
+tools misc: lib
 
 # z_ prefixed version of libz, intended to be linked statically with
 # our libz version to provide the software zlib functionality.
@@ -176,3 +176,4 @@ clean:
 	fi
 	@find . -depth -name '*~'  -exec rm -rf '{}' \; -print
 	@find . -depth -name '.#*' -exec rm -rf '{}' \; -print
+	@$(RM) *.bin *.log

include/libzHW.h

@@ -480,6 +480,7 @@ int zedc_inflateGetHeader(zedc_streamp strm, gzedc_headerp head);
 int zedc_inflateSaveBuffers(zedc_streamp strm, const char *prefix);
 void zedc_lib_debug(int onoff);	/* debug outputs on/off */
 void zedc_set_logfile(FILE *logfile);
+int zedc_inflate_pending_output(struct zedc_stream_s *strm);
 
 /**
  * The application can compare zedc_Version and ZEDC_VERSION for

include/zaddons.h

@@ -34,6 +34,7 @@ enum zlib_impl {
 	ZLIB_FLAG_CACHE_HANDLES = 0x20,	   /* GenWQE only, fails for CAPI */
 	ZLIB_FLAG_OMIT_LAST_DICT = 0x40,   /* Useful for cases like Genomics */
 	ZLIB_FLAG_USE_POLLING = 0x80,  /* Use polling mode only for CAPI */
+	ZLIB_FLAG_DISABLE_CV_FOR_Z_STREAM_END = 0x100,
 };
 
 /**

lib/Makefile

@@ -22,6 +22,13 @@ libversion = $(VERSION)
 CFLAGS += -fPIC -fno-strict-aliasing
 LDLIBS += -lpthread -ldl -lrt
 
+# If we use libcxl, we need to reflect that to avoid underlinkage
+ifeq ($(WITH_LIBCXL),1)
+ifneq ($(BUNDLE_LIBCXL),1)
+LDLIBS += -lcxl
+endif
+endif
+
 ### Accelerated libz implementation (Accelerated Data Compression/ADC)
 libname=libzADC
 projA = $(libname).a \
@@ -203,7 +210,7 @@ uninstall:
 	$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< > $*.d
 
 clean distclean:
-	$(RM) *.o *.d $(projs) *.so
+	$(RM) *.o *.d $(projs) *.so *.so.*
 ifneq ($(CONFIG_LIBCXL_PATH),)
 	$(MAKE) -C $(CONFIG_LIBCXL_PATH) $@
 endif