Added TESTING target to makefiles.

Makefile

@@ -30,6 +30,9 @@ clean :
 	$(Q)make clean -C examples
 	$(Q)make clean -C third_party/minizip
 	$(Q)rm -rf docs/html
+	$(Q)rm -rf test/functional/__pycache__
+	$(Q)rm -f  test/functional/*.pyc
+	$(Q)rm -f  lib/*
 
 # Run the unit tests.
 test : all test_functional test_unit
@@ -41,9 +44,11 @@ test_functional : all
 	$(Q)py.test test/functional -v
 
 # Run all tests.
-test_unit : all
+test_unit :
 	@echo "Compiling unit tests ..."
-	$(Q)make test -C test/unit
+	$(Q)make -C third_party/minizip
+	$(Q)make -C src test_lib
+	$(Q)make -C test/unit test
 
 # Test the functional test exes with valgrind.
 test_valgrind : all

include/xlsxwriter/common.h

@@ -13,9 +13,7 @@
 #include "xlsxwriter/third_party/queue.h"
 
 #ifndef TESTING
-/* Turn off until release. TODO */
-/* #define STATIC static */
-#define STATIC
+#define STATIC static
 #else
 #define STATIC
 #endif

src/Makefile

@@ -25,6 +25,9 @@ CFLAGS   += -g -O3 -Wall -Wextra -pedantic -ansi
 LIBXLSXWRITER_A  = libxlsxwriter.a
 LIBXLSXWRITER_SO = libxlsxwriter.so
 
+# Library with additional non-static functions for testing.
+LIBXLSXWRITER_TO = libxlsxwriter_test.a
+
 # Flags passed to static linker.
 ARFLAGS = rc
 
@@ -46,19 +49,28 @@ HDRS = $(wildcard ../include/xlsxwriter/*.h)
 SRCS  = $(wildcard *.c)
 OBJS  = $(patsubst %.c,%.o,$(SRCS))
 SOBJS = $(patsubst %.c,%.so,$(SRCS))
+TOBJS = $(patsubst %.c,%.to,$(SRCS))
 # End of OBJS
 
 # Build the object files and the libraries.
 all : $(LIBXLSXWRITER_A) $(LIBXLSXWRITER_SO)
 	$(Q)cp $(LIBXLSXWRITER_A) $(LIBXLSXWRITER_SO) ../lib
 
+test_lib : libxlsxwriter_test.a
+
 # The static library.
 $(LIBXLSXWRITER_A) : $(OBJS)
 	$(Q)$(AR) $(ARFLAGS)     $@ $(MINIZIP_DIR)/ioapi.o  $(MINIZIP_DIR)/zip.o  $^
 
+# The dynamic library.
 $(LIBXLSXWRITER_SO) : $(SOBJS)
 	$(Q)$(CC) $(SOFLAGS)  -o $@ $(MINIZIP_DIR)/ioapi.so $(MINIZIP_DIR)/zip.so $^ -lz
 
+# The test library.
+$(LIBXLSXWRITER_TO) : $(TOBJS)
+	$(Q)$(AR) $(ARFLAGS)     $@ $(MINIZIP_DIR)/ioapi.o  $(MINIZIP_DIR)/zip.o  $^
+
+
 # Targets for the object files.
 %.o  : %.c $(HDRS)
 	$(Q)$(CC)       -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $<
@@ -66,6 +78,10 @@ $(LIBXLSXWRITER_SO) : $(SOBJS)
 %.so : %.c $(HDRS)
 	$(Q)$(CC) -fPIC -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
 
+%.to : %.c $(HDRS)
+	$(Q)$(CC) -DTESTING -I$(INC_DIR) $(CFLAGS) $(CXXFLAGS) -c $< -o $@
+
+
 # Clean up any temp/build files.
 clean :
-	$(Q)rm -f *.o *.a *.so *.dylib
+	$(Q)rm -f *.o *.a *.so *.to *.dylib

test/functional/src/Makefile

@@ -33,6 +33,7 @@ $(LIBXLSXWRITER):
 
 clean :
 	$(Q)rm -f $(EXES)
+	$(Q)rm -rf *.dSYM
 
 # Executable targets.
 %: %.c $(LIBXLSXWRITER)

test/unit/Makefile

@@ -46,7 +46,7 @@ SRCS += $(wildcard styles/test*.cpp)
 OBJS  = $(patsubst %.cpp,%.o,$(SRCS))
 
 # Libs to link.
-LIBS_A = $(LIB_DIR)/libxlsxwriter.a $(GTEST_DIR)/libgtest.a $(GTEST_DIR)/libgtest_main.a
+LIBS_A = $(LIB_DIR)/libxlsxwriter_test.a $(GTEST_DIR)/libgtest.a $(GTEST_DIR)/libgtest_main.a
 LIBS_O = -lpthread -lz
 # End of LIBS
 

test/unit/Makefile.unit

@@ -31,7 +31,7 @@ TESTS = $(patsubst %.cpp,%,$(SRCS))
 OBJS  = $(patsubst %.cpp,%.o,$(SRCS))
 
 # Libs to link.
-LIBS_A = $(LIB_DIR)/libxlsxwriter.a $(GTEST_DIR)/libgtest.a $(GTEST_DIR)/libgtest_main.a
+LIBS_A = $(LIB_DIR)/libxlsxwriter_test.a $(GTEST_DIR)/libgtest.a $(GTEST_DIR)/libgtest_main.a
 LIBS_O = -lpthread -lz
 
 # Make all the individual tests.

test/unit/helper.h

@@ -1,8 +1,4 @@
 
-#ifndef TESTING
-#define TESTING
-#endif
-
 /* Compare expected results with the XML data written to the output
  * test file.
  */