[gcr] tap-gtester: Bring in some fixes from elsewhere

[Stefan Walter <stefw src gnome org>]

commit 58e0665a50b30e39dcd92fbe862e23be788f5bc5
Author: Stef Walter <stefw gnome org>
Date:   Thu Mar 6 21:50:26 2014 +0100

    tap-gtester: Bring in some fixes from elsewhere

 build/tap-gtester |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/build/tap-gtester b/build/tap-gtester
index ff7506a..7e667d4 100755
--- a/build/tap-gtester
+++ b/build/tap-gtester
@@ -74,10 +74,11 @@ class GTestCompiler(NullCompiler):
                self.test_remaining.remove(self.test_name)
                self.test_num += 1
            elif cmd == "result":
-               if data == "OK":
-                   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 self.test_name:
+                   if data == "OK":
+                       print "ok %d %s" % (self.test_num, self.test_name)
+                   if data == "FAIL":
+                       print "not ok %d %s", (self.test_num, self.test_name)
                self.test_name = None
            elif cmd == "skipping":
                if "/subprocess" not in data:
@@ -151,6 +152,8 @@ def main(argv):
     cmd = args.command
     proc = None
 
+    os.environ['HARNESS_ACTIVE'] = '1'
+
     if format in ["auto", "gtest"]:
         list_cmd = cmd + ["-l", "--verbose"]
         proc = subprocess.Popen(list_cmd, close_fds=True, stdout=subprocess.PIPE)