Skip to content

fix #836 test_extension are wrongly compiled and installed #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaoxueyu merged 3 commits into from
Sep 1, 2025
Merged

fix #836 test_extension are wrongly compiled and installed #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19e6ad2
fix #836 test_extension are wrongly compiled and installed
OreoYang Aug 27, 2025
349203f
fix oracle_test/modules/test_escape regression failed
OreoYang Aug 28, 2025
f8cd0bc
fix #836 test_extension are wrongly compiled and installed
OreoYang Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GNUmakefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ check check-tests installcheck installcheck-parallel installcheck-tests oracle-p
check check-tests installcheck installcheck-parallel installcheck-tests oracle-pg-check: submake-generated-headers
$(MAKE) -C src/test/regress $@


oracle-check-tests: | oracle-temp-install

# add oracle regression
oracle-check oracle-check-tests oracle-installcheck oracle-installcheck-parallel oracle-installcheck-tests: CHECKPREP_TOP=src/oracle_test/regress
Expand Down
1 change: 0 additions & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ SUBDIRS = \
test/perl \
oracle_test/regress \
oracle_test/isolation \
oracle_test/modules \
oracle_test/perl

ifeq ($(with_llvm), yes)
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.global.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ ifeq ($(MAKELEVEL),0)
rm -rf '$(abs_top_builddir)'/tmp_install
$(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
$(MAKE) -j1 $(if $(CHECKPREP_TOP),-C $(CHECKPREP_TOP),) checkprep >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
$(MAKE) -j1 $(if $(CHECKPREP_TOP),-C $(CHECKPREP_TOP),) oracle-checkprep >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1

$(with_temp_install) initdb --auth trust --no-sync -m oracle -C normal --no-instructions --lc-messages=C --no-clean '$(abs_top_builddir)'/tmp_install/initdb-template >>'$(abs_top_builddir)'/tmp_install/log/initdb-template.log 2>&1
endif
Expand Down
4 changes: 2 additions & 2 deletions src/oracle_test/isolation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ oracle-check: all
# Non-default tests. It only makes sense to run these if set up to use
# prepared transactions, via TEMP_CONFIG for the check case, or via the
# postgresql.conf for the installcheck case.
oracle-installcheck-prepared-txns: all temp-install
oracle-installcheck-prepared-txns: all oracle-temp-install
$(oracle_isolation_regress_installcheck) --schedule=$(srcdir)/isolation_schedule prepared-transactions prepared-transactions-cic

oracle-check-prepared-txns: all temp-install
oracle-check-prepared-txns: all oracle-temp-install
$(oracle_isolation_regress_check) --schedule=$(srcdir)/isolation_schedule prepared-transactions prepared-transactions-cic
4 changes: 2 additions & 2 deletions src/oracle_test/modules/test_escape/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# src/test/modules/test_escape/Makefile
# src/oracle_test/modules/test_escape/Makefile

PGFILEDESC = "test escape program"
PGAPPICON = win32
Expand All @@ -17,7 +17,7 @@ PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
else
subdir = src/test/modules/test_escape
subdir = src/oracle_test/modules/test_escape
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
Expand Down
4 changes: 2 additions & 2 deletions src/oracle_test/modules/test_oat_hooks/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# src/test/modules/test_oat_hooks/Makefile
# src/oracle_test/modules/test_oat_hooks/Makefile

MODULE_big = test_oat_hooks
OBJS = \
Expand All @@ -19,7 +19,7 @@ PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
else
subdir = src/test/modules/test_oat_hooks
subdir = src/oracle_test/modules/test_oat_hooks
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
Expand Down
4 changes: 2 additions & 2 deletions src/oracle_test/modules/test_resowner/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# src/test/modules/test_resowner/Makefile
# src/oracle_test/modules/test_resowner/Makefile

MODULE_big = test_resowner
OBJS = \
Expand All @@ -17,7 +17,7 @@ PG_CONFIG = pg_config
PGXS := $(shell $(PG_CONFIG) --pgxs)
include $(PGXS)
else
subdir = src/test/modules/test_resowner
subdir = src/oracle_test/modules/test_resowner
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
include $(top_srcdir)/contrib/contrib-global.mk
Expand Down
2 changes: 1 addition & 1 deletion src/oracle_test/recovery/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
EXTRA_INSTALL=contrib/pg_prewarm \
contrib/pg_stat_statements \
contrib/test_decoding \
src/test/modules/injection_points
src/oracle_test/modules/injection_points

subdir = src/oracle_test/recovery
top_builddir = ../../..
Expand Down
4 changes: 2 additions & 2 deletions src/oracle_test/regress/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ ORACLE_REGRESS_OPTS = --dlpath=. --max-concurrent-tests=20 \
oracle-check: all
$(oracle_regress_check) $(ORACLE_REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)

oracle-check-tests: all | temp-install
oracle-check-tests: all | oracle-temp-install
$(oracle_regress_check) $(ORACLE_REGRESS_OPTS) $(MAXCONNOPT) $(TESTS) $(EXTRA_TESTS)

oracle-installcheck: all
Expand All @@ -142,7 +142,7 @@ runtest-parallel: installcheck-parallel oracle-installcheck-parallel
bigtest: all
$(oracle_regress_installcheck) $(ORACLE_REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule --max-connections=1 numeric_big

bigcheck: all | temp-install
bigcheck: all | oracle-temp-install
$(oracle_regress_check) $(ORACLE_REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big


Expand Down