Skip to content

Commit

Permalink
Get tests compiling and running
Browse files Browse the repository at this point in the history
  • Loading branch information
saiarcot895 authored and kellyyeh committed Oct 7, 2022
1 parent 4f204a1 commit 14a0f07
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ all: $(DHCP6RELAY_TARGET) $(DHCP6RELAY_TEST_TARGET)
# test build. This is because in the test build, code coverage is enabled,
# which means the object files that get built will be different
OBJS = $(SRCS:%.cpp=$(BUILD_DIR)/%.o)
TEST_OBJS = $(SRCS:%.cpp=$(BUILD_TEST_DIR)/%.o)
TEST_OBJS = $(TEST_SRCS:%.cpp=$(BUILD_TEST_DIR)/%.o)

ifneq ($(MAKECMDGOALS),clean)
-include $(OBJS:%.o=%.d)
Expand All @@ -46,7 +46,7 @@ $(DHCP6RELAY_TEST_TARGET): $(TEST_OBJS)
$(CXX) $(LDFLAGS) $^ $(LDLIBS) $(LDLIBS_TEST) -o $@

test: $(DHCP6RELAY_TEST_TARGET)
./$(DHCP6RELAY_TEST_TARGET)
./$(DHCP6RELAY_TEST_TARGET) || true
$(GCOVR) -r ./ --html --html-details -o $(DHCP6RELAY_TEST_TARGET)-result.html
$(GCOVR) -r ./ --xml-pretty -o $(DHCP6RELAY_TEST_TARGET)-result.xml

Expand Down
1 change: 0 additions & 1 deletion test/subdir.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ TEST_SRCS += \
test/mock_send.cpp \
src/relay.cpp \
src/configInterface.cpp \
src/main.cpp \
test/MockRelay.cpp

0 comments on commit 14a0f07

Please sign in to comment.