Skip to content

Commit ebaaf38

Browse files
committed
Revert "oauth: Add unit tests for multiplexer handling"
Commit 1443b6c introduced buildfarm breakage for Autoconf animals, which expect to be able to run `make installcheck` on the libpq-oauth directory even if libcurl support is disabled. Some other Meson animals complained of a missing -lm link as well. Since this is the day before a freeze, revert for now and come back later. Discussion: https://postgr.es/m/CAOYmi%2BnCkoh3zB%2BGkZad44%3DFNskwUg6F1kmuxqQZzng7Zgj5tw%40mail.gmail.com
1 parent 1443b6c commit ebaaf38

File tree

4 files changed

+0
-600
lines changed

4 files changed

+0
-600
lines changed

src/interfaces/libpq-oauth/Makefile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,5 @@ uninstall:
7979
rm -f '$(DESTDIR)$(libdir)/$(stlib)'
8080
rm -f '$(DESTDIR)$(libdir)/$(shlib)'
8181

82-
.PHONY: all-tests
83-
all-tests: oauth_tests$(X)
84-
85-
oauth_tests$(X): test-oauth-curl.o oauth-utils.o $(WIN32RES) | submake-libpgport submake-libpq
86-
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(SHLIB_LINK) -o $@
87-
88-
check: all-tests
89-
$(prove_check)
90-
91-
installcheck: all-tests
92-
$(prove_installcheck)
93-
9482
clean distclean: clean-lib
9583
rm -f $(OBJS) $(OBJS_STATIC) $(OBJS_SHLIB)
96-
rm -f test-oauth-curl.o oauth_tests$(X)
97-
rm -rf tmp_check

src/interfaces/libpq-oauth/meson.build

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -47,38 +47,3 @@ libpq_oauth_so = shared_module(libpq_oauth_name,
4747
link_args: export_fmt.format(export_file.full_path()),
4848
kwargs: default_lib_args,
4949
)
50-
51-
libpq_oauth_test_deps = []
52-
53-
oauth_test_sources = files('test-oauth-curl.c') + libpq_oauth_so_sources
54-
55-
if host_system == 'windows'
56-
oauth_test_sources += rc_bin_gen.process(win32ver_rc, extra_args: [
57-
'--NAME', 'oauth_tests',
58-
'--FILEDESC', 'OAuth unit test program',])
59-
endif
60-
61-
libpq_oauth_test_deps += executable('oauth_tests',
62-
oauth_test_sources,
63-
dependencies: [frontend_shlib_code, libpq, libpq_oauth_deps],
64-
kwargs: default_bin_args + {
65-
'c_args': default_bin_args.get('c_args', []) + libpq_oauth_so_c_args,
66-
'c_pch': pch_postgres_fe_h,
67-
'include_directories': [libpq_inc, postgres_inc],
68-
'install': false,
69-
}
70-
)
71-
72-
testprep_targets += libpq_oauth_test_deps
73-
74-
tests += {
75-
'name': 'libpq-oauth',
76-
'sd': meson.current_source_dir(),
77-
'bd': meson.current_build_dir(),
78-
'tap': {
79-
'tests': [
80-
't/001_oauth.pl',
81-
],
82-
'deps': libpq_oauth_test_deps,
83-
},
84-
}

src/interfaces/libpq-oauth/t/001_oauth.pl

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)