From: George Dunlap <george.dunlap@citrix.com>
Date: Fri, 19 May 2017 17:04:51 +0000 (+0100)
Subject: testing: Test master build
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a7ff8f28cb09c03e917b22d244ade24f7b5d3f52;p=people%2Fgdunlap%2Fxsatool.git

testing: Test master build

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---

diff --git a/systemtest.go b/systemtest.go
index 8d1b287..a8a1679 100644
--- a/systemtest.go
+++ b/systemtest.go
@@ -363,6 +363,15 @@ func Story206SyncOne(st *SystemTest) (pass bool) {
 	return pass
 }
 
+func Story206TestMaster(st *SystemTest) bool {
+	fmt.Printf(" xsatool 206 test (initial)")
+	if MainHarness("206", "test") != 0 {
+		st.Errorf("xsatool 206 test (initial - master) failed\n")
+		return false
+	}
+	return true
+}
+
 func Story206(st *SystemTest) bool {
 	fmt.Printf("Starting XSA-206 'story'")
 	// xsatool 206 init xen
@@ -380,6 +389,11 @@ func Story206(st *SystemTest) bool {
 		return false
 	}
 
+	// Test only 'master' patches
+	if !Story206TestMaster(st) {
+		return false
+	}
+	
 	// 206 Backport (should fail at 4.8. 4.7, and 4.6; NOT 4.5)
 
 	// 206 sync-patches