Extract bdd library from main test script.

contrib/pg_upgrade/test/integration/Makefile

@@ -9,6 +9,7 @@ OBJS = scripts/gpdb5-cluster.o \
 	utilities/gpdb6-cluster.o \
 	utilities/query-helpers.o \
 	utilities/upgrade-helpers.o \
+	bdd-library/upgrade-bdd.o \
 	greenplum_five_to_greenplum_six_upgrade_test.o
 
 EXS = scripts/gpdb6-cluster scripts/gpdb5-cluster
@@ -21,6 +22,7 @@ all: scripts/gpdb5-cluster scripts/gpdb6-cluster
 
 utilities_CPPFLAGS = -I$(pg_upgrade_directory) \
 	-I$(libpq_srcdir) \
+	-I.\
 
 
 #
@@ -37,6 +39,7 @@ scripts/gpdb6-cluster: scripts/gpdb6-cluster.o utilities/gpdb6-cluster.o
 utilities/gpdb5-cluster.o \
 	utilities/gpdb6-cluster.o \
 	utilities/query-helpers.o \
+	bdd-library/upgrade-bdd.o \
 	greenplum_five_to_greenplum_six_upgrade_test.o: override CPPFLAGS += $(utilities_CPPFLAGS)
 
 #
@@ -46,6 +49,7 @@ test_dependencies = utilities/gpdb5-cluster.o \
 	utilities/gpdb6-cluster.o \
 	utilities/query-helpers.o \
 	utilities/upgrade-helpers.o \
+	bdd-library/upgrade-bdd.o \
 	$(CMOCKERY_OBJS)
 
 

contrib/pg_upgrade/test/integration/bdd-library/bdd.h

+#ifndef BDD_LIBRARY_H
+#define BDD_LIBRARY_H
+
+void given(void (*arrangeFunction) (void));
+void when(void (*actFunction) (void));
+void then(void (*assertionFunction) (void));
+void and(void (*assertionFunction) (void));
+
+#endif /* BDD_LIBRARY_H */

contrib/pg_upgrade/test/integration/bdd-library/upgrade-bdd.c

+#include "bdd.h"
+
+#include "utilities/gpdb5-cluster.h"
+#include "utilities/gpdb6-cluster.h"
+
+void
+given(void (*arrangeFunction) (void))
+{
+	startGpdbFiveCluster();
+	arrangeFunction();
+	stopGpdbFiveCluster();
+}
+
+void
+when(void (*actFunction) (void))
+{
+	actFunction();
+}
+
+void
+then(void (*assertionFunction) (void))
+{
+	startGpdbSixCluster();
+	assertionFunction();
+	stopGpdbSixCluster();
+}
+
+void
+and(void (*assertionFunction) (void))
+{
+	/* and has the same behavior as then */
+	then(assertionFunction);
+}
+

contrib/pg_upgrade/test/integration/greenplum_five_to_greenplum_six_upgrade_test.c

@@ -14,6 +14,7 @@
 #include "utilities/gpdb6-cluster.h"
 #include "utilities/upgrade-helpers.h"
 #include "utilities/query-helpers.h"
+#include "bdd-library/bdd.h"
 
 static void
 setup(void **state)
@@ -312,35 +313,6 @@ anAdministratorPerformsAnUpgrade()
 	performUpgrade();
 }
 
-static void
-given(void (*arrangeFunction) (void))
-{
-	startGpdbFiveCluster();
-	arrangeFunction();
-	stopGpdbFiveCluster();
-}
-
-static void
-then(void (*assertionFunction) (void))
-{
-	startGpdbSixCluster();
-	assertionFunction();
-	stopGpdbSixCluster();
-}
-
-static void
-when(void (*actFunction) (void))
-{
-	actFunction();
-}
-
-static void
-and(void (*assertionFunction) (void))
-{
-	/* and has the same behavior as then */
-	then(assertionFunction);
-}
-
 static void
 test_a_heap_table_with_data_can_be_upgraded(void **state)
 {