From ebbe8790e45ae819a59be95e03fd5291dc4ca314 Mon Sep 17 00:00:00 2001 From: "David E. Wheeler" Date: Sat, 25 Feb 2012 13:03:49 -0800 Subject: [PATCH] Move tests to test subdirectory. --- Makefile | 8 ++++---- {expected => test/expected}/plproxy_clustermap.out | 0 {expected => test/expected}/plproxy_dynamic_record.out | 0 {expected => test/expected}/plproxy_encoding.out | 0 {expected => test/expected}/plproxy_errors.out | 0 {expected => test/expected}/plproxy_init.out | 0 {expected => test/expected}/plproxy_many.out | 0 {expected => test/expected}/plproxy_select.out | 0 {expected => test/expected}/plproxy_split.out | 0 {expected => test/expected}/plproxy_sqlmed.out | 0 {expected => test/expected}/plproxy_target.out | 0 {expected => test/expected}/plproxy_test.out | 0 {sql => test/sql}/plproxy_clustermap.sql | 0 {sql => test/sql}/plproxy_dynamic_record.sql | 0 {sql => test/sql}/plproxy_encoding.sql | 0 {sql => test/sql}/plproxy_errors.sql | 0 {sql => test/sql}/plproxy_init.sql | 0 {sql => test/sql}/plproxy_many.sql | 0 {sql => test/sql}/plproxy_select.sql | 0 {sql => test/sql}/plproxy_split.sql | 0 {sql => test/sql}/plproxy_sqlmed.sql | 0 {sql => test/sql}/plproxy_target.sql | 0 {sql => test/sql}/plproxy_test.sql | 0 23 files changed, 4 insertions(+), 4 deletions(-) rename {expected => test/expected}/plproxy_clustermap.out (100%) rename {expected => test/expected}/plproxy_dynamic_record.out (100%) rename {expected => test/expected}/plproxy_encoding.out (100%) rename {expected => test/expected}/plproxy_errors.out (100%) rename {expected => test/expected}/plproxy_init.out (100%) rename {expected => test/expected}/plproxy_many.out (100%) rename {expected => test/expected}/plproxy_select.out (100%) rename {expected => test/expected}/plproxy_split.out (100%) rename {expected => test/expected}/plproxy_sqlmed.out (100%) rename {expected => test/expected}/plproxy_target.out (100%) rename {expected => test/expected}/plproxy_test.out (100%) rename {sql => test/sql}/plproxy_clustermap.sql (100%) rename {sql => test/sql}/plproxy_dynamic_record.sql (100%) rename {sql => test/sql}/plproxy_encoding.sql (100%) rename {sql => test/sql}/plproxy_errors.sql (100%) rename {sql => test/sql}/plproxy_init.sql (100%) rename {sql => test/sql}/plproxy_many.sql (100%) rename {sql => test/sql}/plproxy_select.sql (100%) rename {sql => test/sql}/plproxy_split.sql (100%) rename {sql => test/sql}/plproxy_sqlmed.sql (100%) rename {sql => test/sql}/plproxy_target.sql (100%) rename {sql => test/sql}/plproxy_test.sql (100%) diff --git a/Makefile b/Makefile index a47205a..3b65b19 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ SHLIB_LINK = -L$(PQLIB) -lpq TARNAME = plproxy-$(PLPROXY_VERSION) DIST_DIRS = src sql expected config doc debian DIST_FILES = Makefile src/plproxy.h src/rowstamp.h src/scanner.l src/parser.y \ - $(foreach t,$(REGRESS),sql/$(t).sql expected/$(t).out) \ + $(foreach t,$(REGRESS),test/sql/$(t).sql test/expected/$(t).out) \ config/simple.config.sql src/poll_compat.h \ doc/Makefile doc/config.txt doc/faq.txt \ doc/syntax.txt doc/todo.txt doc/tutorial.txt \ @@ -36,8 +36,8 @@ DIST_FILES = Makefile src/plproxy.h src/rowstamp.h src/scanner.l src/parser.y \ # regression testing setup REGRESS = plproxy_init plproxy_test plproxy_select plproxy_many \ - plproxy_errors plproxy_clustermap plproxy_dynamic_record \ - plproxy_encoding plproxy_split plproxy_target + plproxy_errors plproxy_clustermap plproxy_dynamic_record \ + plproxy_encoding plproxy_split plproxy_target # SQL files PLPROXY_SQL = plproxy_lang.sql @@ -49,7 +49,7 @@ PLPROXY_SQL += plproxy_fdw.sql endif -REGRESS_OPTS = --dbname=regression +REGRESS_OPTS = --dbname=regression --inputdir=test # pg9.1 ignores --dbname override CONTRIB_TESTDB := regression diff --git a/expected/plproxy_clustermap.out b/test/expected/plproxy_clustermap.out similarity index 100% rename from expected/plproxy_clustermap.out rename to test/expected/plproxy_clustermap.out diff --git a/expected/plproxy_dynamic_record.out b/test/expected/plproxy_dynamic_record.out similarity index 100% rename from expected/plproxy_dynamic_record.out rename to test/expected/plproxy_dynamic_record.out diff --git a/expected/plproxy_encoding.out b/test/expected/plproxy_encoding.out similarity index 100% rename from expected/plproxy_encoding.out rename to test/expected/plproxy_encoding.out diff --git a/expected/plproxy_errors.out b/test/expected/plproxy_errors.out similarity index 100% rename from expected/plproxy_errors.out rename to test/expected/plproxy_errors.out diff --git a/expected/plproxy_init.out b/test/expected/plproxy_init.out similarity index 100% rename from expected/plproxy_init.out rename to test/expected/plproxy_init.out diff --git a/expected/plproxy_many.out b/test/expected/plproxy_many.out similarity index 100% rename from expected/plproxy_many.out rename to test/expected/plproxy_many.out diff --git a/expected/plproxy_select.out b/test/expected/plproxy_select.out similarity index 100% rename from expected/plproxy_select.out rename to test/expected/plproxy_select.out diff --git a/expected/plproxy_split.out b/test/expected/plproxy_split.out similarity index 100% rename from expected/plproxy_split.out rename to test/expected/plproxy_split.out diff --git a/expected/plproxy_sqlmed.out b/test/expected/plproxy_sqlmed.out similarity index 100% rename from expected/plproxy_sqlmed.out rename to test/expected/plproxy_sqlmed.out diff --git a/expected/plproxy_target.out b/test/expected/plproxy_target.out similarity index 100% rename from expected/plproxy_target.out rename to test/expected/plproxy_target.out diff --git a/expected/plproxy_test.out b/test/expected/plproxy_test.out similarity index 100% rename from expected/plproxy_test.out rename to test/expected/plproxy_test.out diff --git a/sql/plproxy_clustermap.sql b/test/sql/plproxy_clustermap.sql similarity index 100% rename from sql/plproxy_clustermap.sql rename to test/sql/plproxy_clustermap.sql diff --git a/sql/plproxy_dynamic_record.sql b/test/sql/plproxy_dynamic_record.sql similarity index 100% rename from sql/plproxy_dynamic_record.sql rename to test/sql/plproxy_dynamic_record.sql diff --git a/sql/plproxy_encoding.sql b/test/sql/plproxy_encoding.sql similarity index 100% rename from sql/plproxy_encoding.sql rename to test/sql/plproxy_encoding.sql diff --git a/sql/plproxy_errors.sql b/test/sql/plproxy_errors.sql similarity index 100% rename from sql/plproxy_errors.sql rename to test/sql/plproxy_errors.sql diff --git a/sql/plproxy_init.sql b/test/sql/plproxy_init.sql similarity index 100% rename from sql/plproxy_init.sql rename to test/sql/plproxy_init.sql diff --git a/sql/plproxy_many.sql b/test/sql/plproxy_many.sql similarity index 100% rename from sql/plproxy_many.sql rename to test/sql/plproxy_many.sql diff --git a/sql/plproxy_select.sql b/test/sql/plproxy_select.sql similarity index 100% rename from sql/plproxy_select.sql rename to test/sql/plproxy_select.sql diff --git a/sql/plproxy_split.sql b/test/sql/plproxy_split.sql similarity index 100% rename from sql/plproxy_split.sql rename to test/sql/plproxy_split.sql diff --git a/sql/plproxy_sqlmed.sql b/test/sql/plproxy_sqlmed.sql similarity index 100% rename from sql/plproxy_sqlmed.sql rename to test/sql/plproxy_sqlmed.sql diff --git a/sql/plproxy_target.sql b/test/sql/plproxy_target.sql similarity index 100% rename from sql/plproxy_target.sql rename to test/sql/plproxy_target.sql diff --git a/sql/plproxy_test.sql b/test/sql/plproxy_test.sql similarity index 100% rename from sql/plproxy_test.sql rename to test/sql/plproxy_test.sql -- 2.39.5