tweek Xvfb handling

releng.control/cc.sh

@@ -65,29 +65,3 @@ echo
 echo "    remember to check that X virtual frame buffer is running for display :$DISPLAYNUMBER for headless unit tests";
 ps -ef | grep Xvfb
 echo;
-
-
-
-PIDFILE=cc.xvfbpid
-echo;
-if [ -f ${PIDFILE} ] ; then
-  echo "    Killing Xvfb process from PID file"
-  PID=`cat ${PIDFILE}`
-  kill -3 $PID
-  # if permission denied, for example, then be sure not to remove PID file
-  if [ $? ]
-  then
-          if kill -9 $PID ; then
-            echo "    Xvfb process stopped"
-            rm -f ${PIDFILE}
-          else
-            echo "    Xvfb process could not be stopped"
-          fi
-  else
-    echo "    Could not kill the process."
-  fi
-else
-        echo "    PID file (${PIDFILE}) does not exist."
-        echo "        Either Xvfb not running, or PID file has been deleted"
-fi
-echo;

releng.control/killcc.sh

@@ -21,4 +21,28 @@ else
 	echo "    PID file (${PIDFILE}) does not exist."
 	echo "        Either CC not running, or PID file deleted"
 fi
-echo
+echo;
\ No newline at end of file
+
+PIDFILE=cc.xvfbpid
+
+if [ -f ${PIDFILE} ] ; then
+  echo "    Killing Xvfb process from PID file"
+  PID=`cat ${PIDFILE}`
+  kill -3 $PID
+  # if permission denied, for example, then be sure not to remove PID file
+  if [ $? ]
+  then
+          if kill -9 $PID ; then
+            echo "    Xvfb process stopped"
+            rm -f ${PIDFILE}
+          else
+            echo "    Xvfb process could not be stopped"
+          fi
+  else
+    echo "    Could not kill the process."
+  fi
+else
+        echo "    PID file (${PIDFILE}) does not exist."
+        echo "        Either Xvfb not running, or PID file has been deleted"
+fi
+echo;