[gnome-ostree] Add installed-tests-xfail, use it in integrationtest

[Colin Walters <walters src gnome org>]

commit 7a0834f9124cb3390d9bfbf96a41c8f21bb5518f
Author: Colin Walters <walters verbum org>
Date:   Mon Jun 24 17:02:24 2013 -0400

    Add installed-tests-xfail, use it in integrationtest
    
    We just added clutter tests, but one reliably fails only in llvmpipe.
    Until this gets debugged and fixed, mark it as xfail so we go back
    to having a green integrationtest.

 manifest.json                        |    2 ++
 src/js/tasks/task-integrationtest.js |    9 +++++++++
 2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index e84c140..61eb906 100644
--- a/manifest.json
+++ b/manifest.json
@@ -879,6 +879,8 @@
 
     "installed-tests-components": [],
 
+    "installed-tests-xfail": ["clutter/texture-fbo.test"],
+
     "initramfs-build-epoch": {"version": 0},
     
     "build-epoch": {"version": 11,
diff --git a/src/js/tasks/task-integrationtest.js b/src/js/tasks/task-integrationtest.js
index 8a8d9d2..a40daf3 100644
--- a/src/js/tasks/task-integrationtest.js
+++ b/src/js/tasks/task-integrationtest.js
@@ -74,6 +74,15 @@ const TaskIntegrationTest = new Lang.Class({
         ProcUtil.runSync(['ostree', '--repo=' + this.repo.get_path(),
                           'checkout', '--no-triggers', '--user-mode', '--union', installedTestsRev, 
deployDir.get_path()], cancellable,
                          { logInitiation: true });
+        let xfailTests = this._buildData['snapshot']['installed-tests-xfail'] || [];
+        for (let i = 0; i < xfailTests.length; i++) {
+            let xfail = xfailTests[i];
+            let path = deployDir.resolve_relative_path('usr/share/installed-tests/' + xfail);
+            if (path.query_exists(null))
+                GSystem.file_unlink(path, cancellable);
+            else
+                print("NOTE: No such xfail test: " + xfail);
+        }
         let desktopFile = '[Desktop Entry]\n\
 Encoding=UTF-8\n\
 Name=GNOME installed tests runner\n\