Skip to content

DAOS-19906 build: keep libraft.a and tests_main between builds #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OrHayat wants to merge 3 commits into
base: master
Choose a base branch
from
Open

DAOS-19906 build: keep libraft.a and tests_main between builds #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa8d42e
DAOS-19906 build: keep libraft.a and tests_main between builds
OrHayat Nov 2, 2026
c5a344a
DAOS-19906 build: keep test objects under a test directory
OrHayat Nov 4, 2026
1642449
DAOS-19906 build: return test objects to flat test-*.o files
OrHayat Nov 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 30 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
CONTRIB_DIR = contrib
TEST_DIR = ./tests
TEST_DIR = tests
LLQUEUE_DIR = $(CONTRIB_DIR)/CLinkedListQueue
VPATH = src
BUILDDIR ?= .

GCOV_OUTPUT = $(BUILDDIR)/*.gcda $(BUILDDIR)/*.gcno $(BUILDDIR)/*.gcov
Expand Down Expand Up @@ -33,7 +32,7 @@ all: static shared
$(BUILDDIR):
mkdir -p $@

$(BUILDDIR)/%.o: %.c $(wildcard include/*.h) | $(BUILDDIR)
$(BUILDDIR)/%.o: src/%.c $(wildcard include/*.h) | $(BUILDDIR)
$(CC) $(CFLAGS) -c -o $@ $<

$(TEST_DIR)/main_test.c: $(TEST_DIR)/test_*.c
Expand All @@ -44,12 +43,36 @@ shared: $(OBJECTS)
$(CC) $(OBJECTS) $(LDFLAGS) $(CFLAGS) -fPIC $(SHAREDFLAGS) -o $(BUILDDIR)/libraft.$(SHAREDEXT)

.PHONY: static
static: $(OBJECTS)
ar -r $(BUILDDIR)/libraft.a $(OBJECTS)
static: $(BUILDDIR)/libraft.a

$(BUILDDIR)/libraft.a: $(OBJECTS)
rm -f $@
ar -r $@ $(OBJECTS)
Comment thread
OrHayat marked this conversation as resolved.
Resolved

tests_main: src/raft_server.c src/raft_server_properties.c src/raft_log.c src/raft_node.c $(TEST_DIR)/main_test.c $(TEST_DIR)/test_*.c $(TEST_DIR)/mock_send_functions.c $(TEST_DIR)/CuTest.c $(LLQUEUE_DIR)/linked_list_queue.c
$(CC) $(CFLAGS) -o $(BUILDDIR)/$@ $^

TEST_SRCS = src/raft_server.c src/raft_server_properties.c src/raft_log.c src/raft_node.c \
$(TEST_DIR)/main_test.c $(wildcard $(TEST_DIR)/test_*.c) \
$(TEST_DIR)/mock_send_functions.c $(TEST_DIR)/CuTest.c $(LLQUEUE_DIR)/linked_list_queue.c
TEST_OBJS = $(addprefix $(BUILDDIR)/test-,$(notdir $(TEST_SRCS:.c=.o)))
HEADERS = $(wildcard include/*.h $(TEST_DIR)/*.h $(LLQUEUE_DIR)/*.h)

# With BUILDDIR=. the file itself is tests_main, so the alias would point at itself
ifneq ($(BUILDDIR),.)
.PHONY: tests_main
tests_main: $(BUILDDIR)/tests_main
endif

$(BUILDDIR)/test-%.o: src/%.c $(HEADERS) $(MAKEFILE_LIST) | $(BUILDDIR)
$(CC) $(CFLAGS) -c -o $@ $<

$(BUILDDIR)/test-%.o: $(TEST_DIR)/%.c $(HEADERS) $(MAKEFILE_LIST) | $(BUILDDIR)
$(CC) $(CFLAGS) -c -o $@ $<

$(BUILDDIR)/test-%.o: $(LLQUEUE_DIR)/%.c $(HEADERS) $(MAKEFILE_LIST) | $(BUILDDIR)
$(CC) $(CFLAGS) -c -o $@ $<

$(BUILDDIR)/tests_main: $(TEST_OBJS)
$(CC) $(CFLAGS) -o $@ $(TEST_OBJS)

.PHONY: tests
tests: tests_main
Expand Down
1 change: 1 addition & 0 deletions src/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ test_main = env.Command('tests_main', libraft, 'make -C src/rdb/raft/ BUILDDIR=%
# make to build them will bail out if they don't actually need rebuilding
AlwaysBuild(libraft)
AlwaysBuild(test_main)
Precious(libraft, test_main)

def CleanAction(env, action):
if env.GetOption('clean'):
Expand Down