isolation2: remove EXTRA_TESTS

Author: Jacob Champion <pchampion@pivotal.io>
Author: Xin Zhang <xzhang@pivotal.io>
Author: Ashwin Agrawal <aagrawal@pivotal.io>

src/test/isolation2/Makefile

@@ -20,8 +20,6 @@ endif
 override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPFLAGS)
 override LDLIBS := $(libpq_pgport) $(LDLIBS)
 
-EXTRA_TESTS=segwalrep/commit_blocking segwalrep/fts_unblock_primary
-
 all: pg_isolation2_regress$(X) all-lib
 
 pg_regress.o:
@@ -52,8 +50,10 @@ clean distclean:
 	rm -f gpstringsubs.pl gpdiff.pl atmsort.pm explain.pm
 	rm -rf $(pg_regress_clean_files)
 
-installcheck: all gpdiff.pl gpstringsubs.pl
-	./pg_isolation2_regress --init-file=$(top_builddir)/src/test/regress/init_file --init-file=./init_file_isolation2 --psqldir='$(PSQLDIR)' --inputdir=$(srcdir) --ao-dir=uao --schedule=$(srcdir)/isolation2_schedule $(EXTRA_TESTS)
+install: all gpdiff.pl gpstringsubs.pl
+
+installcheck: install
+	./pg_isolation2_regress --init-file=$(top_builddir)/src/test/regress/init_file --init-file=./init_file_isolation2 --psqldir='$(PSQLDIR)' --inputdir=$(srcdir) --ao-dir=uao --schedule=$(srcdir)/isolation2_schedule
 
 installcheck-resgroup: all gpdiff.pl gpstringsubs.pl prepare_dblink_sql
 	./pg_isolation2_regress --init-file=$(top_builddir)/src/test/regress/init_file --init-file=./init_file_resgroup --psqldir='$(PSQLDIR)' --inputdir=$(srcdir) --resgroup-dir=resgroup --dbname=isolation2resgrouptest --schedule=$(srcdir)/isolation2_resgroup_schedule

src/test/isolation2/isolation2_schedule

@@ -103,3 +103,7 @@ test: uao/vacuum_while_vacuum_column
 test: uao/vacuum_cleanup_column
 test: add_column_after_vacuum_skip_drop_column
 test: vacuum_after_vacuum_skip_drop_column
+
+# Tests for FTS
+test: segwalrep/commit_blocking
+test: segwalrep/fts_unblock_primary

src/test/isolation2/isolation2_segwalrep_schedule

-test: segwalrep/commit_blocking