build: Sync tap-driver and tap-gtester with gnome-keyring

2 files changed, 13 insertions, 5 deletions

diff --git a/build/tap-driver b/build/tap-driver
index 96fd219..e0490ae 100755
--- a/build/tap-driver
+++ b/build/tap-driver
@@ -162,8 +162,11 @@ class TapDriver(Driver):
             return
         description = description.lstrip()
 
-        # Special case if description starts with this, then skip
-        if description.lower().startswith("# skip"):
+        # Parse out a directive from description, if any
+        (description, unused, directive) = description.partition("#")
+
+        # Special case if directive starts with this, then skip
+        if directive.lstrip().lower().startswith("skip"):
             self.result_skip(num, description)
         elif ok:
             self.result_pass(num, description)
@@ -222,9 +225,12 @@ class TapDriver(Driver):
             if code != "SKIP":
                 skipped = False
 
-        if not self.errored and returncode:
-            self.report_error("process failed: %d" % returncode)
-            self.errored = True
+        if not self.errored:
+            if returncode == 77:
+                skipped = True
+            elif returncode:
+                self.report_error("process failed: %d" % returncode)
+                self.errored = True
 
         # Check the plan
         if not self.errored:
diff --git a/build/tap-gtester b/build/tap-gtester
index e075281..8949f4d 100755
--- a/build/tap-gtester
+++ b/build/tap-gtester
@@ -79,6 +79,8 @@ class GTestCompiler(NullCompiler):
                        print "ok %d %s" % (self.test_num, self.test_name)
                    if data == "FAIL":
                        print "not ok %d %s", (self.test_num, self.test_name)
+                   if data == "SKIP":
+                       print "ok %d %s # skip" % (self.test_num, self.test_name)
                self.test_name = None
            elif cmd == "skipping":
                if "/subprocess" not in data: