Merge pull request #6 from brendanlong/blong/circleci (7308a895) · Commits · App_Technologies / portabledsb

.gitignore

+1 −0

deleted100644 → 0

+0 −45

Original line number	Diff line number	Diff line
		SRCS=VariantTest.cpp
		ALLJOYN_INSTALL_DIR?=/
		GTEST_DIR?=/usr/src/gtest
		LIBXML_INC?=/usr/include/libxml2

		CXX_WARNINGS=-Wall -Wextra -Wno-missing-field-initializers -Wno-deprecated-declarations -Wno-ignored-qualifiers
		CXX_DEFINES=-D QCC_OS_GROUP_POSIX
		CXX_SEARCH=-I.. -I$(ALLJOYN_INSTALL_DIR)/inc -I$(LIBXML_INC) -I$(GTEST_DIR)/include
		CXXFLAGS=-isystem -std=c++0x -g $(CXX_WARNINGS) $(CXX_DEFINES) $(CXX_SEARCH)

		LDFLAGS=-L$(ALLJOYN_INSTALL_DIR)/lib -lalljoyn -lcrypto -lxml2 -L$(GTEST_DIR)/libgtest.a

		TEST_OBJS=$(patsubst %.cpp, %.o, $(SRCS))
		OBJS=$(TEST_OBJS)
		DEPS = $(OBJS:%.o=%.d)

		UNAME_S = $(shell uname -s)
		ifeq ($(UNAME_S),Linux)
		LDFLAGS += -pthread -luuid
		endif

		ifeq ($V, 1)
		CXX_PRETTY = $(CXX)
		LD_PRETTY = $(CXX)
		else
		CXX_PRETTY = @echo " [CXX] $<" ; $(CXX)
		LD_PRETTY = @echo "[LINK] $@" ; $(CXX)
		endif

		ALL_TESTS=VariantTest

		all: $(ALL_TESTS)
		clean:
		$(RM) $(ALL_TESTS) $(OBJS) $(DEPS)

		VariantTest: VariantTest.cpp ../Variant.cpp
		$(CXX) -isystem $(CXXFLAGS) $(LDFLAGS) $^ $(GTEST_DIR)/libgtest.a -o $@

		%.o: %.cpp
		$(CXX_PRETTY) $(CXXFLAGS) -MMD -c -o $@ $<

		%.o: $(GTEST_DIR)/src/%.cc
		$(CXX_PRETTY) $(CXXFLAGS) -MMD -c -o $@ $<

		#-include $(DEPS)

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line

		Unit tests for common. Uses google gtest.

		sudo apt-get install libgtest-dev

+24 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@ SRCS=DeviceProviders/AllJoynProvider.cpp \
		Adapters/ZigBeeAdapter/ZigBeeAdapter.cpp \
		main.cpp

		TEST_SRCS = Tests/VariantTest.cpp
		TEST_OBJS = $(patsubst %.cpp, %.o, $(TEST_SRCS))
		TESTS = $(patsubst %.cpp, %, $(TEST_SRCS))

		LIBXML_INC?=/usr/include/libxml2

		ALLJOYN_INSTALL_DIR?=/Users/jgladi200/Work/alljoyn/alljoyn-15.09.00a-src/build/darwin/x86/debug/dist/cpp
		@@ -27,7 +31,15 @@ CXXFLAGS=-D QCC_OS_GROUP_POSIX -Wall -Wextra -Wno-missing-field-initializers -Wn
		LDFLAGS=-L $(ALLJOYN_INSTALL_DIR)/lib -lalljoyn -lcrypto -lxml2
		DEV_PROVIDER_OBJS=$(patsubst %.cpp, %.o, $(SRCS))
		OBJS=$(DEV_PROVIDER_OBJS)
		DEPS = $(OBJS:%.o=%.d)
		DEPS = $(OBJS:%.o=%.d) $(TEST_OBJS:%.o=%.d)

		GTEST_DIR?=/usr/src/gtest
		ifneq ("$(wildcard $(GTEST_DIR)/libgtest.a)","")
		GTEST_FLAGS = $(GTEST_DIR)/libgtest.a
		CXXFLAGS += -I$(GTEST_DIR)/include
		else
		GTEST_FLAGS = -lgtest
		endif

		UNAME_S = $(shell uname -s)
		ifeq ($(UNAME_S),Linux)
		@@ -50,12 +62,22 @@ endif

		all: moc-adapter

		tests: $(TESTS)

		check: tests
		@for test in $(TESTS) ; do \
		$$test ; \
		done

		clean:
		$(RM) moc-adapter $(OBJS) $(DEPS)
		$(RM) moc-adapter $(TESTS) $(OBJS) $(DEPS) $(TEST_OBJS)

		moc-adapter: $(OBJS)
		$(LD_PRETTY) -o $@ $^ $(LDFLAGS)

		Tests/VariantTest: Tests/VariantTest.o Common/Variant.o
		$(LD_PRETTY) -o $@ $^ $(LDFLAGS) $(GTEST_FLAGS)

		%.o: %.cpp
		$(CXX_PRETTY) $(CXXFLAGS) -MMD -c -o $@ $<

+1 −1

Original line number	Diff line number	Diff line

		#include <gtest/gtest.h>
		#include <Variant.h>
		#include <Common/Variant.h>

		template<class T>
		std::vector<T> makeVect(int n, int start = 0)