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

Commit 2497a66

Browse files
committed
Further cleanup for recent JSON-related commits.
Add overlooked .gitignore entries. Fix test_json_parser/Makefile to use the pgxs.mk clean rule instead of fighting it. Suppresses a warning from make, at least for me.
1 parent 8862082 commit 2497a66

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/interfaces/ecpg/test/sql/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,7 @@
4848
/sqlda.c
4949
/sqljson
5050
/sqljson.c
51+
/sqljson_jsontable
52+
/sqljson_jsontable.c
5153
/twophase
5254
/twophase.c

src/test/modules/test_json_parser/Makefile

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ TAP_TESTS = 1
66

77
OBJS = test_json_parser_incremental.o test_json_parser_perf.o
88

9+
EXTRA_CLEAN = test_json_parser_incremental$(X) test_json_parser_perf$(X)
10+
911
ifdef USE_PGXS
1012
PG_CONFIG = pg_config
1113
PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -17,8 +19,6 @@ include $(top_builddir)/src/Makefile.global
1719
include $(top_srcdir)/contrib/contrib-global.mk
1820
endif
1921

20-
.PHONY: clean
21-
2222
all: test_json_parser_incremental$(X) test_json_parser_perf$(X)
2323

2424
%.o: $(top_srcdir)/$(subdir)/%.c
@@ -36,6 +36,3 @@ speed-check: test_json_parser_perf$(X)
3636
time ./test_json_parser_perf 10000 $(top_srcdir)/$(subdir)/tiny.json
3737
@echo Incremental parser:
3838
time ./test_json_parser_perf -i 10000 $(top_srcdir)/$(subdir)/tiny.json
39-
40-
clean:
41-
rm -rf test_json_parser_perf test_json_parser_incremental tmp_check $(OBJS)

0 commit comments

Comments
 (0)