Skip to content

Commit cb9c591

Browse files
committed
test: re-add integration test
use `make unittest` to run only the unittest
1 parent e270092 commit cb9c591

File tree

2 files changed

+493
-5
lines changed

2 files changed

+493
-5
lines changed

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ TEST_SRC = $(wildcard $(TEST_DIR)/*.c)
5555
TEST_FILES = $(SRC_FILES) $(TEST_SRC) $(wildcard $(SQLITE_DIR)/*.c)
5656
RELEASE_OBJ = $(patsubst %.c, $(BUILD_RELEASE)/%.o, $(notdir $(SRC_FILES)))
5757
TEST_OBJ = $(patsubst %.c, $(BUILD_TEST)/%.o, $(notdir $(TEST_FILES)))
58-
COV_FILES = $(filter-out $(SRC_DIR)/lz4.c $(SRC_DIR)/network.c, $(SRC_FILES))
58+
COV_FILES = $(filter-out $(SRC_DIR)/lz4.c $(SRC_DIR)/network.c $(SRC_DIR)/database_postgresql.c, $(SRC_FILES))
5959
CURL_LIB = $(CURL_DIR)/$(PLATFORM)/libcurl.a
6060
TEST_TARGET = $(patsubst %.c,$(DIST_DIR)/%$(EXE), $(notdir $(TEST_SRC)))
6161

@@ -196,8 +196,11 @@ $(BUILD_TEST)/%.o: %.c
196196

197197
# Run code coverage (--css-file $(CUSTOM_CSS))
198198
test: $(TARGET) $(TEST_TARGET)
199-
$(SQLITE3) ":memory:" -cmd ".bail on" ".load ./$<" "SELECT cloudsync_version();"
200-
set -e; for t in $(TEST_TARGET); do ./$$t; done
199+
@if [ -f .env ]; then \
200+
export $$(grep -v '^#' .env | xargs); \
201+
fi; \
202+
set -e; $(SQLITE3) ":memory:" -cmd ".bail on" ".load ./$<" "SELECT cloudsync_version();" && \
203+
for t in $(TEST_TARGET); do ./$$t; done
201204
ifneq ($(COVERAGE),false)
202205
mkdir -p $(COV_DIR)
203206
lcov --capture --directory . --output-file $(COV_DIR)/coverage.info $(subst src, --include src,${COV_FILES})
@@ -206,8 +209,7 @@ endif
206209

207210
# Run only unit tests
208211
unittest: $(TARGET) $(DIST_DIR)/unit$(EXE)
209-
$(SQLITE3) ":memory:" -cmd ".bail on" ".load ./$(TARGET)" "SELECT cloudsync_version();"
210-
./$(DIST_DIR)/unit$(EXE)
212+
@./$(DIST_DIR)/unit$(EXE)
211213

212214
$(OPENSSL):
213215
git clone https://github.com/openssl/openssl.git $(CURL_DIR)/src/openssl

0 commit comments

Comments
 (0)