xref: /OK3568_Linux_fs/yocto/poky/meta/lib/oeqa/manual/abat.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1*4882a593Smuzhiyun########
2*4882a593Smuzhiyundiff --git a/glxgears_check.sh b/glxgears_check.sh
3*4882a593Smuzhiyunindex 17622b8..c4d3b97 100755
4*4882a593Smuzhiyun--- a/glxgears_check.sh
5*4882a593Smuzhiyun+++ b/glxgears_check.sh
6*4882a593Smuzhiyun@@ -31,7 +31,7 @@ else
7*4882a593Smuzhiyun
8*4882a593Smuzhiyun     sleep 6
9*4882a593Smuzhiyun
10*4882a593Smuzhiyun-    XPID=$( ps ax | awk '{print $1, $5}' | grep glxgears | awk '{print $1}')
11*4882a593Smuzhiyun+    XPID=$( ps | awk '{print $1, $5}' | grep glxgears | awk '{print $1}')
12*4882a593Smuzhiyun     if [ ! -z "$XPID" ]; then
13*4882a593Smuzhiyun         kill -9 $XPID >/dev/null 2>&1
14*4882a593Smuzhiyun         echo "glxgears can run, PASS!"
15*4882a593Smuzhiyundiff --git a/x_close.sh b/x_close.sh
16*4882a593Smuzhiyunindex e287be1..3429f1a 100755
17*4882a593Smuzhiyun--- a/x_close.sh
18*4882a593Smuzhiyun+++ b/x_close.sh
19*4882a593Smuzhiyun@@ -22,7 +22,7 @@
20*4882a593Smuzhiyun #
21*4882a593Smuzhiyun function close_proc(){
22*4882a593Smuzhiyun echo "kill process Xorg"
23*4882a593Smuzhiyun-XPID=$(  ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" | awk '{print $1}')
24*4882a593Smuzhiyun+XPID=$(  ps | awk '{print $1, $6}' | egrep "X$|Xorg$" | awk '{print $1}')
25*4882a593Smuzhiyun if [ ! -z "$XPID" ]; then
26*4882a593Smuzhiyun     kill $XPID
27*4882a593Smuzhiyun     sleep 4
28*4882a593Smuzhiyundiff --git a/x_start.sh b/x_start.sh
29*4882a593Smuzhiyunindex 9cf6eab..2305796 100755
30*4882a593Smuzhiyun--- a/x_start.sh
31*4882a593Smuzhiyun+++ b/x_start.sh
32*4882a593Smuzhiyun@@ -24,7 +24,7 @@
33*4882a593Smuzhiyun X_ERROR=0
34*4882a593Smuzhiyun
35*4882a593Smuzhiyun #test whether X has started
36*4882a593Smuzhiyun-PXID=$(ps ax |awk '{print $1,$5}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}')
37*4882a593Smuzhiyun+PXID=$(ps |awk '{print $1,$6}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}')
38*4882a593Smuzhiyun if [ ! -z "$PXID" ]; then
39*4882a593Smuzhiyun     echo "[WARNING] Xorg has started!"
40*4882a593Smuzhiyun     XORG_STATUS="started"
41*4882a593Smuzhiyun@@ -35,9 +35,11 @@ else
42*4882a593Smuzhiyun     #start up the x server
43*4882a593Smuzhiyun     echo "Start up the X server for test in display $DISPLAY................"
44*4882a593Smuzhiyun
45*4882a593Smuzhiyun-    $XORG_DIR/bin/X >/dev/null 2>&1 &
46*4882a593Smuzhiyun+    #$XORG_DIR/bin/X >/dev/null 2>&1 &
47*4882a593Smuzhiyun+    #sleep 8
48*4882a593Smuzhiyun+    #xterm &
49*4882a593Smuzhiyun+    /etc/init.d/xserver-nodm start &
50*4882a593Smuzhiyun     sleep 8
51*4882a593Smuzhiyun-    xterm &
52*4882a593Smuzhiyun fi
53*4882a593Smuzhiyun     XLOG_FILE=/var/log/Xorg.0.log
54*4882a593Smuzhiyun     [ -f $XORG_DIR/var/log/Xorg.0.log ] && XLOG_FILE=$XORG_DIR/var/log/Xorg.0.log
55*4882a593Smuzhiyun@@ -54,7 +56,7 @@ fi
56*4882a593Smuzhiyun         X_ERROR=1
57*4882a593Smuzhiyun     fi
58*4882a593Smuzhiyun
59*4882a593Smuzhiyun-    XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}')
60*4882a593Smuzhiyun+    XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}')
61*4882a593Smuzhiyun     if [ -z "$XPID" ]; then
62*4882a593Smuzhiyun         echo "Start up X server FAIL!"
63*4882a593Smuzhiyun  echo
64*4882a593Smuzhiyun########