move platform-specific tests into their own spot

Author: plainlystated

CppUTest/build/MakefileWorker.mk

@@ -192,7 +192,7 @@ OBJ = $(call src_to_o,$(SRC))
 
 STUFF_TO_CLEAN += $(OBJ)
 
-TEST_SRC = $(call get_src_from_dir_list, $(TEST_SRC_DIRS))
+TEST_SRC = $(call get_src_from_dir_list, $(TEST_SRC_DIRS)) $(TEST_SRC_FILES)
 TEST_OBJS = $(call src_to_o,$(TEST_SRC))
 STUFF_TO_CLEAN += $(TEST_OBJS)
 
@@ -287,10 +287,10 @@ $(TARGET_LIB): $(OBJ)
 	$(SILENCE)$(AR) $(ARFLAGS) $@ $^
 	$(SILENCE)ranlib $@
 
-test: $(TEST_TARGET)
+test_platform: $(TEST_TARGET)
 	$(RUN_TEST_TARGET)
 
-vtest: $(TEST_TARGET)
+vtest_platform: $(TEST_TARGET)
 	$(RUN_TEST_TARGET) -v
 
 $(CPPUTEST_OBJS_DIR)/%.o: %.cpp

Makefile

@@ -3,6 +3,13 @@
 #Set this to @ to keep the makefile quiet
 SILENCE = @
 
+ifdef PLATFORM
+	COMPONENT_NAME = "$(PLATFORM)_"
+	SRC_FILES = src/tempodb/platform/$(PLATFORM).c
+	TEST_SRC_FILES = tests/TempoDb/platform/$(PLATFORM)_test.c
+	MOCKS_SRC_DIRS = mocks/$(PLATFORM)
+endif
+
 #---- Outputs ----#
 COMPONENT_NAME = tempodb
 
@@ -11,25 +18,23 @@ CPPUTEST_HOME = CppUTest
 CPP_PLATFORM = Gcc
 PROJECT_HOME_DIR = .
 
-SRC_DIRS = \
-	src/tempodb\
-	src/tempodb/platform
+SRC_DIRS += \
+	src/tempodb
 
-TEST_SRC_DIRS = \
+TEST_SRC_DIRS += \
 	.\
 	mocks\
 	tests/TempoDb\
-	tests\
-
+	tests
 
 INCLUDE_DIRS =\
   .\
   $(CPPUTEST_HOME)/include\
   mocks\
 	include/tempodb
 
-MOCKS_SRC_DIRS = \
-	mocks\
+MOCKS_SRC_DIRS += \
+	mocks
 
 CPPUTEST_WARNINGFLAGS = -Wall -Wswitch-default -Werror
 #CPPUTEST_CFLAGS = -std=c89
@@ -59,4 +64,11 @@ objs/platform/posix.o:
 CppUTest/lib/libCppUTest.a:
 	cd CppUTest && make lib/libCppUTest.a
 
+vtest_posix:
+	$(SILENCE)echo ">>> Running Posix Tests"
+	$(SILENCE)PLATFORM="posix" make vtest_platform
+	$(SILENCE)echo "<<< Finished Posix Tests"
+
+vtest: vtest_posix
+
 include $(CPPUTEST_HOME)/build/MakefileWorker.mk

mocks/TCPSocketStub.c renamed to mocks/posix/posix_mock.c

@@ -1,4 +1,4 @@
-#include "TCPSocketStub.h"
+#include "posix_mock.h"
 #include <stdio.h>
 
 static struct hostent *hent;

mocks/TCPSocketStub.h renamed to mocks/posix/posix_mock.h

@@ -1,5 +1,5 @@
-#ifndef TCPSocketStub_H
-#define TCPSocketStub_H
+#ifndef TEMPODB_PLATFORM_POSIX_MOCK_H
+#define TEMPODB_PLATFORM_POSIX_MOCK_H
 
 #include <arpa/inet.h>
 #include <netdb.h>

tests/TempoDb/TempoDbTest.cpp renamed to tests/TempoDb/platform/posix_test.cpp

@@ -4,7 +4,7 @@ extern "C" {
 #include "tempodb.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include "TCPSocketStub.h"
+#include "posix_mock.h"
 #include <string.h>
 }