diff --git a/patches/test_setup_enable_oriole.diff b/patches/test_setup_enable_oriole.diff deleted file mode 100644 index 302f616810a..00000000000 --- a/patches/test_setup_enable_oriole.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/src/test/regress/expected/test_setup.out b/src/test/regress/expected/test_setup.out -index 3d0eeec996..70ce94e21a 100644 ---- a/src/test/regress/expected/test_setup.out -+++ b/src/test/regress/expected/test_setup.out -@@ -21,6 +21,8 @@ GRANT ALL ON SCHEMA public TO public; - -- Create a tablespace we can use in tests. - SET allow_in_place_tablespaces = true; - CREATE TABLESPACE regress_tblspace LOCATION ''; -+-- Enable orioledb extension -+CREATE EXTENSION orioledb; - -- - -- These tables have traditionally been referenced by many tests, - -- so create and populate them. Insert only non-error values here. -diff --git a/src/test/regress/sql/test_setup.sql b/src/test/regress/sql/test_setup.sql -index 06b0e2121f..867ad6a2df 100644 ---- a/src/test/regress/sql/test_setup.sql -+++ b/src/test/regress/sql/test_setup.sql -@@ -27,6 +27,9 @@ GRANT ALL ON SCHEMA public TO public; - SET allow_in_place_tablespaces = true; - CREATE TABLESPACE regress_tblspace LOCATION ''; - -+-- Enable orioledb extension -+CREATE EXTENSION orioledb; -+ - -- - -- These tables have traditionally been referenced by many tests, - -- so create and populate them. Insert only non-error values here. diff --git a/src/test/regress/parallel_schedule_oriole b/src/test/regress/parallel_schedule_oriole index dfd35775913..ad10b0a8e41 100644 --- a/src/test/regress/parallel_schedule_oriole +++ b/src/test/regress/parallel_schedule_oriole @@ -43,6 +43,7 @@ test: copy copyselect copydml # Note: many of the tests in later groups depend on create_index # ---------- test: create_function_c create_misc create_operator create_procedure create_type create_schema create_view +test: create_index # ---------- # Another group of parallel tests @@ -104,7 +105,7 @@ test: json_encoding jsonpath jsonpath_encoding jsonb_jsonpath sqljson sqljson_qu # NB: temp.sql does a reconnect which transiently uses 2 connections, # so keep this parallel group to at most 19 tests # ---------- -test: plancache rangefuncs prepare sequence polymorphism largeobject xml +test: plancache rangefuncs prepare alter_table sequence polymorphism largeobject xml # ---------- # Another group of parallel tests diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index fc8ad4c36dc..53435c47420 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -62,8 +62,8 @@ static char *shellprog = SHELLPROG; * Windows-style newlines, but the comparison files might or might not. */ #ifndef WIN32 -const char *basic_diff_opts = "-I \"NOTICE\" -I \"DETAIL\" -I \"WARNING\""; -const char *pretty_diff_opts = "-I \"NOTICE\" -I \"DETAIL\" -I \"WARNING\" -U3"; +const char *basic_diff_opts = ""; +const char *pretty_diff_opts = "-U3"; #else const char *basic_diff_opts = "--strip-trailing-cr"; const char *pretty_diff_opts = "--strip-trailing-cr -U3";