While applying latest version of the patch (regress-big-v4.patch) on
latest PostgreSQL version i encountered following errors: [...]
Is that a problem ?
Yes and no:-)
My understanding is that there is a conflict because of commits between
this patch and head: a file that this patch deletes (it is derived by make
rules) has been updated. It seems that git is not too good at detecting
this and providing a meaningful message.
Please find attached an updated version which seemed to work for me.
Note that this is really a POC. How to derive a file is under discussion:
it has been suggested that the unix shell approach would not work on
Windows. I've suggested perl or python (which version?) but I'm not sure
that it is okay either.
--
Fabien.
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index d5935b6..8a39f7d 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -86,7 +86,7 @@ regress_data_files = \
$(wildcard $(srcdir)/output/*.source) \
$(filter-out $(addprefix $(srcdir)/,$(input_files)),$(wildcard $(srcdir)/sql/*.sql)) \
$(wildcard $(srcdir)/data/*.data) \
- $(srcdir)/parallel_schedule $(srcdir)/serial_schedule $(srcdir)/resultmap
+ $(srcdir)/parallel_schedule $(srcdir)/parallel_big_schedule $(srcdir)/resultmap
install-tests: all install install-lib installdirs-tests
$(MAKE) -C $(top_builddir)/contrib/spi install
@@ -137,19 +137,43 @@ tablespace-setup:
## Run tests
##
+# installcheck vs check:
+# - whether test is run against installed or compiled version
+# test schedules: parallel, parallel_big, standby
+# serial schedules can be derived from parallel schedules
+
+derived_schedules = serial_schedule serial_big_schedule
+
+serial_%: parallel_%
+ echo "# this file is generated automatically, do not edit!" > $@
+ egrep '^(test|ignore):' $< | \
+ while read op list ; do \
+ for test in $$list ; do \
+ echo "$$op $$test" ; \
+ done ; \
+ done >> $@
+
REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS)
+# before installation, parallel
check: all tablespace-setup
- $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS)
+ $(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TEMP_CONF) \
+ --schedule=$(srcdir)/parallel_schedule $(EXTRA_TESTS)
-installcheck: all tablespace-setup
- $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule $(EXTRA_TESTS)
+# after installation, serial
+installcheck: all tablespace-setup serial_schedule
+ $(pg_regress_installcheck) $(REGRESS_OPTS) \
+ --schedule=serial_schedule $(EXTRA_TESTS)
+# after installation, parallel
installcheck-parallel: all tablespace-setup
- $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
+ $(pg_regress_installcheck) $(REGRESS_OPTS) $(MAXCONNOPT) \
+ --schedule=$(srcdir)/parallel_schedule $(EXTRA_TESTS)
+# after installation
standbycheck: all
- $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing
+ $(pg_regress_installcheck) $(REGRESS_OPTS) \
+ --schedule=$(srcdir)/standby_schedule --use-existing
# old interfaces follow...
@@ -157,11 +181,19 @@ runcheck: check
runtest: installcheck
runtest-parallel: installcheck-parallel
-bigtest: all tablespace-setup
- $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
+bigtest: installcheck-big
+
+# test = after installation, serial
+installcheck-big: all tablespace-setup serial_schedule serial_big_schedule
+ $(pg_regress_installcheck) $(REGRESS_OPTS) \
+ --schedule=serial_schedule \
+ --schedule=serial_big_schedule
+# check = before installation, parallel
bigcheck: all tablespace-setup
- $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
+ $(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) \
+ --schedule=$(srcdir)/parallel_schedule \
+ --schedule=$(srcdir)/parallel_big_schedule
##
@@ -173,6 +205,6 @@ clean distclean maintainer-clean: clean-lib
rm -f $(OBJS) refint$(DLSUFFIX) autoinc$(DLSUFFIX) dummy_seclabel$(DLSUFFIX)
rm -f pg_regress_main.o pg_regress.o pg_regress$(X)
# things created by various check targets
- rm -f $(output_files) $(input_files)
+ rm -f $(output_files) $(input_files) $(derived_schedules)
rm -rf testtablespace
rm -rf $(pg_regress_clean_files)
diff --git a/src/test/regress/parallel_big_schedule b/src/test/regress/parallel_big_schedule
new file mode 100644
index 0000000..9434abf
--- /dev/null
+++ b/src/test/regress/parallel_big_schedule
@@ -0,0 +1 @@
+test: numeric_big
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
deleted file mode 100644
index 3ad289f..0000000
--- a/src/test/regress/serial_schedule
+++ /dev/null
@@ -1,141 +0,0 @@
-# src/test/regress/serial_schedule
-# This should probably be in an order similar to parallel_schedule.
-test: tablespace
-test: boolean
-test: char
-test: name
-test: varchar
-test: text
-test: int2
-test: int4
-test: int8
-test: oid
-test: float4
-test: float8
-test: bit
-test: numeric
-test: txid
-test: uuid
-test: enum
-test: money
-test: rangetypes
-test: strings
-test: numerology
-test: point
-test: lseg
-test: box
-test: path
-test: polygon
-test: circle
-test: date
-test: time
-test: timetz
-test: timestamp
-test: timestamptz
-test: interval
-test: abstime
-test: reltime
-test: tinterval
-test: inet
-test: macaddr
-test: tstypes
-test: comments
-test: geometry
-test: horology
-test: regex
-test: oidjoins
-test: type_sanity
-test: opr_sanity
-test: insert
-test: create_function_1
-test: create_type
-test: create_table
-test: create_function_2
-test: copy
-test: copyselect
-test: create_misc
-test: create_operator
-test: create_index
-test: create_view
-test: create_aggregate
-test: create_function_3
-test: create_cast
-test: constraints
-test: triggers
-test: inherit
-test: create_table_like
-test: typed_table
-test: vacuum
-test: drop_if_exists
-test: updatable_views
-test: sanity_check
-test: errors
-test: select
-test: select_into
-test: select_distinct
-test: select_distinct_on
-test: select_implicit
-test: select_having
-test: subselect
-test: union
-test: case
-test: join
-test: aggregates
-test: transactions
-ignore: random
-test: random
-test: portals
-test: arrays
-test: btree_index
-test: hash_index
-test: update
-test: delete
-test: namespace
-test: prepared_xacts
-test: privileges
-test: security_label
-test: collate
-test: matview
-test: alter_generic
-test: misc
-test: psql
-test: async
-test: rules
-test: event_trigger
-test: select_views
-test: portals_p2
-test: foreign_key
-test: cluster
-test: dependency
-test: guc
-test: bitmapops
-test: combocid
-test: tsearch
-test: tsdicts
-test: foreign_data
-test: window
-test: xmlmap
-test: functional_deps
-test: advisory_lock
-test: json
-test: indirect_toast
-test: plancache
-test: limit
-test: plpgsql
-test: copy2
-test: temp
-test: domain
-test: rangefuncs
-test: prepare
-test: without_oid
-test: conversion
-test: truncate
-test: alter_table
-test: sequence
-test: polymorphism
-test: rowtypes
-test: returning
-test: largeobject
-test: with
-test: xml
-test: stats
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
