]> xenbits.xensource.com Git - people/gdunlap/xsatool/commitdiff
testing: Test master build
authorGeorge Dunlap <george.dunlap@citrix.com>
Fri, 19 May 2017 17:04:51 +0000 (18:04 +0100)
committerGeorge Dunlap <george.dunlap@citrix.com>
Fri, 19 May 2017 17:04:51 +0000 (18:04 +0100)
Signed-off-by: George Dunlap <george.dunlap@citrix.com>
systemtest.go

index 8d1b287adf7cd73d78ba78ae505e23fc7d451d23..a8a16791ff9a147e39a6f3fe398a04a54e54a110 100644 (file)
@@ -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