Commit85e2b80

committed

use cmocka instead of cmockery

1 parentf949215 commit85e2b80Copy full SHA for 85e2b80

File tree

+14

-2267

lines changed

+14

-2267

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ RUN if [ "${CHECK_CODE}" = "cppcheck" ] ; then \`
`12`	`12`	`fi`
`13`	`13`
`14`	`14`	`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;\`
`16`	`17`	`pip3 install testgres; \`
`17`	`18`	`fi`
`18`	`19`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ if [ $status -ne 0 ]; then exit $status; fi`
`61`	`61`
`62`	`62`	`set -u`
`63`	`63`
`64`		`-# runmock tests (using CFLAGS_SL for gcov)`
	`64`	`+# runcmocka tests (using CFLAGS_SL for gcov)`
`65`	`65`	`make USE_PGXS=1 PG_CPPFLAGS="-coverage" cmocka_tests\|\| status=$?`
`66`	`66`	`if [$status-ne 0 ];thenexit$status;fi`
`67`	`67`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ CFLAGS += $(shell $(PG_CONFIG) --cflags_sl)`
`8`	`8`	`CFLAGS +=$(shell$(PG_CONFIG) --cflags)`
`9`	`9`	`CFLAGS +=$(CFLAGS_SL)`
`10`	`10`	`CFLAGS +=$(PG_CPPFLAGS)`
	`11`	`+LDFLAGS += -lcmocka`
`11`	`12`	`TEST_BIN = rangeset_tests`
`12`	`13`
`13`	`14`	`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`
`16`	`16`
`17`	`17`
`18`	`18`	`all: build_extension$(TEST_BIN)`

Comments

(0)