On Tue, May 12, 2015 at 11:43 AM, Michael Paquier
<michael.paqu...@gmail.com> wrote:
> On Tue, May 12, 2015 at 11:37 AM, Alvaro Herrera
> <alvhe...@2ndquadrant.com> wrote:
>> Michael Paquier wrote:
>>> On Tue, May 12, 2015 at 7:16 AM, Alvaro Herrera <alvhe...@alvh.no-ip.org> 
>>> wrote:
>> Not sure what's the real fix here ..
>
> I think that you should then use MODULE_big instead of MODULES, and
> set OBJS as "test_dll_parser.o $(WIN32RES)".

Taking it back, listing explicitly the list of tests in the Makefile's
REGRESS works just fine. Patch attached.
-- 
Michael
From aeb75022ba2a8becaab78b55d31d9f54b44f1b80 Mon Sep 17 00:00:00 2001
From: Michael Paquier <mich...@otacoo.com>
Date: Tue, 12 May 2015 12:50:03 +0900
Subject: [PATCH] Fix test_ddl_deparse for MSVC builds

The list of regression tests should be passed explicitly with REGRESS
instead of passing a regression schedule file path.
---
 src/test/modules/test_ddl_deparse/.gitignore       |  2 ++
 src/test/modules/test_ddl_deparse/Makefile         | 25 +++++++++++++++++++++-
 src/test/modules/test_ddl_deparse/regress_schedule | 21 ------------------
 3 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 src/test/modules/test_ddl_deparse/.gitignore
 delete mode 100644 src/test/modules/test_ddl_deparse/regress_schedule

diff --git a/src/test/modules/test_ddl_deparse/.gitignore b/src/test/modules/test_ddl_deparse/.gitignore
new file mode 100644
index 0000000..19b6c5b
--- /dev/null
+++ b/src/test/modules/test_ddl_deparse/.gitignore
@@ -0,0 +1,2 @@
+# Generated subdirectories
+/results/
diff --git a/src/test/modules/test_ddl_deparse/Makefile b/src/test/modules/test_ddl_deparse/Makefile
index a87b691..25ecedf 100644
--- a/src/test/modules/test_ddl_deparse/Makefile
+++ b/src/test/modules/test_ddl_deparse/Makefile
@@ -1,10 +1,33 @@
+# src/test/modules/test_ddl_deparse/Makefile
+
 MODULES = test_ddl_deparse
 PGFILEDESC = "test_ddl_deparse - regression testing for DDL deparsing"
 
 EXTENSION = test_ddl_deparse
 DATA = test_ddl_deparse--1.0.sql
 
-REGRESS = --schedule=$(srcdir)/regress_schedule
+# test_ddl_deparse must be first
+REGRESS = \
+	test_ddl_deparse \
+	create_extension \
+	create_schema \
+	create_type \
+	create_conversion \
+	create_domain \
+	create_sequence_1 \
+	create_table \
+	alter_table \
+	create_view \
+	create_trigger \
+	create_rule \
+	comment_on \
+	alter_function \
+	alter_sequence \
+	alter_type_enum \
+	opfamily \
+	defprivs \
+	matviews
+
 EXTRA_INSTALL = contrib/pg_stat_statements
 
 ifdef USE_PGXS
diff --git a/src/test/modules/test_ddl_deparse/regress_schedule b/src/test/modules/test_ddl_deparse/regress_schedule
deleted file mode 100644
index 1819ae5..0000000
--- a/src/test/modules/test_ddl_deparse/regress_schedule
+++ /dev/null
@@ -1,21 +0,0 @@
-# must be first
-test: test_ddl_deparse
-
-test: create_extension
-test: create_schema
-test: create_type
-test: create_conversion
-test: create_domain
-test: create_sequence_1
-test: create_table
-test: alter_table
-test: create_view
-test: create_trigger
-test: create_rule
-test: comment_on
-test: alter_function
-test: alter_sequence
-test: alter_type_enum
-test: opfamily
-test: defprivs
-test: matviews
-- 
2.4.0

-- 
Sent via pgsql-committers mailing list (pgsql-committers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-committers

Reply via email to