Move unittests into their own file to improve coverage calculations

Author: reedacartwright

Makefile

@@ -15,12 +15,13 @@ all: sofos
 .PHONY: default all clean
 
 clean:
-	rm -f sofos sofos_debug sofos_unittest sofos_unittest_coverage sofos_coverage
+	rm -f sofos sofos_debug unittest unittest_coverage sofos_coverage
 	rm -f *.gcov *.gcda *.gcno
 	rm -f coverage*.html
 	rm -f clang-tidy.txt clang-format.patch
 
 SOFOSCC=sofos.cc main.cc
+UNITCC=sofos.cc unittest.cc
 SOFOSHPP=sofos.hpp vcf.hpp
 FORMATFILES=$(SOFOSCC) $(SOFOSHPP) test_utils.hpp
 
@@ -30,24 +31,31 @@ sofos: $(SOFOSCC) $(SOFOSHPP)
 sofos_debug: $(SOFOSCC) $(SOFOSHPP)
 	$(CXX) -g -O0 $(SOFOSFLAGS) -o $@ $(SOFOSCC)
 
-sofos_coverage: $(SOFOSCC) $(SOFOSHPP)
-	$(CXX) -g -O0 $(SOFOSFLAGS) $(GCOVFLAGS) -o $@ $(SOFOSCC)
+unittest: $(UNITCC) $(SOFOSHPP)
+	$(CXX) -g -O0 $(SOFOSFLAGS) -DSOFOS_UNIT_TESTS -o $@ $(UNITCC)
 
-sofos_unittest: $(SOFOSCC) $(SOFOSHPP)
-	$(CXX) -g -O0 $(SOFOSFLAGS) -DSOFOS_UNIT_TESTS -o $@ $(SOFOSCC)
+%_cov.o: %.cc
+	$(CXX) -c -g -O0 $(SOFOSFLAGS) $(GCOVFLAGS) -o $@ $<
 
-sofos_unittest_coverage: $(SOFOSCC) $(SOFOSHPP)
-	$(CXX) -g -O0 $(SOFOSFLAGS) $(GCOVFLAGS) -DSOFOS_UNIT_TESTS -o $@ $(SOFOSCC)
+sofos_cov.o : $(SOFOSHPP)
 
-test: sofos_unittest sofos_debug
-	./sofos_unittest
+unit_cov.o : $(SOFOSHPP)
+
+sofos_coverage: $(patsubst %.cc,%_cov.o,$(SOFOSCC))
+	$(CXX) -g -O0 $(SOFOSFLAGS) $(GCOVFLAGS) -o $@ $^
+
+unittest_coverage: $(patsubst %.cc,%_cov.o,$(UNITCC))
+	$(CXX) -g -O0 $(SOFOSFLAGS) $(GCOVFLAGS) -DSOFOS_UNIT_TESTS -o $@ $^
+
+test: unittest sofos_debug
+	./unittest
 	cd test && bash test-01.bash ../sofos_debug
 
-coverage: sofos_coverage sofos_unittest_coverage
+coverage: sofos_coverage unittest_coverage
 	rm -f *.gcda
-	./sofos_unittest_coverage
+	./unittest_coverage
 	cd test && bash test-01.bash ../sofos_coverage	
-	gcovr -r . -e catch.hpp -e test_utils.hpp --html-details -o coverage.html
+	gcovr -r . -e catch.hpp -e unittest.cc --html-details -o coverage.html
 
 test_codecov: sofos_unittest_coverage sofos_coverage
 	rm -f *.gcda
@@ -72,4 +80,4 @@ test_tidy:
 	@$(CLANGTIDY) $(SOFOSCC) -- $(CXXFLAGS) $(SOFOSFLAGS) -Wall 2>/dev/null | tee clang-tidy.txt
 	@test 0 -eq `cat clang-tidy.txt | wc -l`
 
-.PHONY: coverage tidy format test test_codecov test_format
+.PHONY: coverage tidy format test test_codecov test_format cov

main.cc

@@ -20,11 +20,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 *****************************************************************************/
 
-#ifdef SOFOS_UNIT_TESTS
-#define CATCH_CONFIG_MAIN
-#include "catch.hpp"
-#endif
-
 #include "sofos.hpp"
 
 #include <unistd.h>
@@ -67,7 +62,6 @@ void print_usage(const char* exe, std::ostream& os) {
 }
 
 // Main program entry point
-#ifndef CATCH_CONFIG_MAIN
 int main(int argc, char* argv[]) {
     try {
         // default parameters
@@ -158,4 +152,3 @@ int main(int argc, char* argv[]) {
     }
     return EXIT_FAILURE;
 }
-#endif