From 8c9c9adfe0f0fa5c1ade561a61f3f8add3600c22 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sun, 3 Feb 2013 01:21:47 +0100
Subject: improve Xvfb handling when ctest is cancelled partway through


diff --git a/tests/virtualfb.sh b/tests/virtualfb.sh
index e0d8320..d34a4f9 100755
--- a/tests/virtualfb.sh
+++ b/tests/virtualfb.sh
@@ -47,8 +47,12 @@ stop()
 isrunning()
 {
   isrunning_result=
-  if [ -e ./virtualfb.PID ]; then isrunning_result=1 ; fi
-  if [ -e ./virtualfb.DISPLAY ]; then isrunning_result=1 ; fi
+  if [ -e ./virtualfb.PID ]; then
+    VFB_PID=`cat ./virtualfb.PID`
+    if [ "`ps cax | awk ' { print $1 } ' | grep ^$VFB_PID\$`" ]; then
+      isrunning_result=1
+    fi
+  fi
 }
 
 isrunning
-- 
cgit v0.10.1