Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 85e2b80

Browse files
committed
use cmocka instead of cmockery
1 parent f949215 commit 85e2b80

File tree

6 files changed

+14
-2267
lines changed

6 files changed

+14
-2267
lines changed

Dockerfile.tmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ RUN if [ "${CHECK_CODE}" = "cppcheck" ] ; then \
1212
fi
1313

1414
RUN if [ "${CHECK_CODE}" = "false" ] ; then \
15-
apk --no-cache add python3 gcc make musl-dev;\
15+
echo 'http://dl-3.alpinelinux.org/alpine/edge/main' > /etc/apk/repositories; \
16+
apk --no-cache add python3 gcc make musl-dev cmocka-dev;\
1617
pip3 install testgres; \
1718
fi
1819

run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if [ $status -ne 0 ]; then exit $status; fi
6161

6262
set -u
6363

64-
# run mock tests (using CFLAGS_SL for gcov)
64+
# run cmocka tests (using CFLAGS_SL for gcov)
6565
make USE_PGXS=1 PG_CPPFLAGS="-coverage" cmocka_tests || status=$?
6666
if [ $status -ne 0 ]; then exit $status; fi
6767

tests/cmocka/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ CFLAGS += $(shell $(PG_CONFIG) --cflags_sl)
88
CFLAGS += $(shell $(PG_CONFIG) --cflags)
99
CFLAGS += $(CFLAGS_SL)
1010
CFLAGS += $(PG_CPPFLAGS)
11+
LDFLAGS += -lcmocka
1112
TEST_BIN = rangeset_tests
1213

1314
OBJ = missing_basic.o missing_list.o missing_stringinfo.o \
14-
missing_bitmapset.o rangeset_tests.o cmockery.o \
15-
$(TOP_SRC_DIR)/rangeset.o
15+
missing_bitmapset.o rangeset_tests.o $(TOP_SRC_DIR)/rangeset.o
1616

1717

1818
all: build_extension $(TEST_BIN)

0 commit comments

Comments
 (0)