Skip to content

Commit adc1923

Browse files
gaoxueyugaoxueyu
authored
Merge pull request #861 from OreoYang/IVORY_REL_4_STABLE
 fix #836 test_extension are wrongly compiled and installed
2 parents 7fc7ba3 + f8cd0bc commit adc1923

File tree

9 files changed

+13
-14
lines changed

9 files changed

+13
-14
lines changed

‎GNUmakefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ check check-tests installcheck installcheck-parallel installcheck-tests oracle-p
6969
check check-tests installcheck installcheck-parallel installcheck-tests oracle-pg-check: submake-generated-headers
7070
$(MAKE) -C src/test/regress $@
7171

72-
72+
oracle-check-tests: | oracle-temp-install
7373

7474
# add oracle regression
7575
oracle-check oracle-check-tests oracle-installcheck oracle-installcheck-parallel oracle-installcheck-tests: CHECKPREP_TOP=src/oracle_test/regress

‎src/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ SUBDIRS = \
3535
test/perl \
3636
oracle_test/regress \
3737
oracle_test/isolation \
38-
oracle_test/modules \
3938
oracle_test/perl
4039

4140
ifeq ($(with_llvm), yes)

‎src/Makefile.global.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ ifeq ($(MAKELEVEL),0)
447447
rm -rf '$(abs_top_builddir)'/tmp_install
448448
$(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log
449449
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
450-
$(MAKE) -j1 $(if $(CHECKPREP_TOP),-C $(CHECKPREP_TOP),) checkprep >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
450+
$(MAKE) -j1 $(if $(CHECKPREP_TOP),-C $(CHECKPREP_TOP),) oracle-checkprep >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
451451

452452
$(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
453453
endif

‎src/oracle_test/isolation/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ oracle-check: all
7575
# Non-default tests. It only makes sense to run these if set up to use
7676
# prepared transactions, via TEMP_CONFIG for the check case, or via the
7777
# postgresql.conf for the installcheck case.
78-
oracle-installcheck-prepared-txns: all temp-install
78+
oracle-installcheck-prepared-txns: all oracle-temp-install
7979
$(oracle_isolation_regress_installcheck) --schedule=$(srcdir)/isolation_schedule prepared-transactions prepared-transactions-cic
8080

81-
oracle-check-prepared-txns: all temp-install
81+
oracle-check-prepared-txns: all oracle-temp-install
8282
$(oracle_isolation_regress_check) --schedule=$(srcdir)/isolation_schedule prepared-transactions prepared-transactions-cic

‎src/oracle_test/modules/test_escape/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# src/test/modules/test_escape/Makefile
1+
# src/oracle_test/modules/test_escape/Makefile
22

33
PGFILEDESC = "test escape program"
44
PGAPPICON = win32
@@ -17,7 +17,7 @@ PG_CONFIG = pg_config
1717
PGXS := $(shell $(PG_CONFIG) --pgxs)
1818
include $(PGXS)
1919
else
20-
subdir = src/test/modules/test_escape
20+
subdir = src/oracle_test/modules/test_escape
2121
top_builddir = ../../../..
2222
include $(top_builddir)/src/Makefile.global
2323
include $(top_srcdir)/contrib/contrib-global.mk

‎src/oracle_test/modules/test_oat_hooks/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# src/test/modules/test_oat_hooks/Makefile
1+
# src/oracle_test/modules/test_oat_hooks/Makefile
22

33
MODULE_big = test_oat_hooks
44
OBJS = \
@@ -19,7 +19,7 @@ PG_CONFIG = pg_config
1919
PGXS := $(shell $(PG_CONFIG) --pgxs)
2020
include $(PGXS)
2121
else
22-
subdir = src/test/modules/test_oat_hooks
22+
subdir = src/oracle_test/modules/test_oat_hooks
2323
top_builddir = ../../../..
2424
include $(top_builddir)/src/Makefile.global
2525
include $(top_srcdir)/contrib/contrib-global.mk

‎src/oracle_test/modules/test_resowner/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# src/test/modules/test_resowner/Makefile
1+
# src/oracle_test/modules/test_resowner/Makefile
22

33
MODULE_big = test_resowner
44
OBJS = \
@@ -17,7 +17,7 @@ PG_CONFIG = pg_config
1717
PGXS := $(shell $(PG_CONFIG) --pgxs)
1818
include $(PGXS)
1919
else
20-
subdir = src/test/modules/test_resowner
20+
subdir = src/oracle_test/modules/test_resowner
2121
top_builddir = ../../../..
2222
include $(top_builddir)/src/Makefile.global
2323
include $(top_srcdir)/contrib/contrib-global.mk

‎src/oracle_test/recovery/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
EXTRA_INSTALL=contrib/pg_prewarm \
1515
contrib/pg_stat_statements \
1616
contrib/test_decoding \
17-
src/test/modules/injection_points
17+
src/oracle_test/modules/injection_points
1818

1919
subdir = src/oracle_test/recovery
2020
top_builddir = ../../..

‎src/oracle_test/regress/GNUmakefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ ORACLE_REGRESS_OPTS = --dlpath=. --max-concurrent-tests=20 \
121121
oracle-check: all
122122
$(oracle_regress_check) $(ORACLE_REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
123123

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

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

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

148148

0 commit comments

Comments
 (0)