summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/manual/abat.patch
diff options
context:
space:
mode:
authorYeoh Ee Peng <ee.peng.yeoh@intel.com>2018-10-11 17:39:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-11 23:06:35 +0100
commitefb1e2d8318412d6de39075699a02a3a12760cef (patch)
tree3f709cbf4c4eb26398ecbc92e69b93a12279a718 /meta/lib/oeqa/manual/abat.patch
parentaa2b645bf20fb17bfba7fff1c989173396e4f753 (diff)
downloadpoky-efb1e2d8318412d6de39075699a02a3a12760cef.tar.gz
oeqa/manual: transfer manual test cases from testopia to oeqa
As part of the solution to replace Testopia, manual test cases need to be migrated to OEQA. These manual test case json files will serve two use cases. Use case#1: as input to the future commandline-based manual test runner script, where this script will display actions and expected result information in user friendly text, then it will capture user input for test result and log, finally it will write test result and log into existing standardize test result json format from OEQA framework for automated tests. Use case#2: QA will open and read these json file manually for planning manual test execution. Any reader interested in understanding manual test cases will open and read these files. (From OE-Core rev: dcaf843878e9adcb3fab025d54cd5d9ceb6c2fce) Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/manual/abat.patch')
-rw-r--r--meta/lib/oeqa/manual/abat.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/lib/oeqa/manual/abat.patch b/meta/lib/oeqa/manual/abat.patch
new file mode 100644
index 0000000000..1541ac80cb
--- /dev/null
+++ b/meta/lib/oeqa/manual/abat.patch
@@ -0,0 +1,64 @@
1########
2diff --git a/glxgears_check.sh b/glxgears_check.sh
3index 17622b8..c4d3b97 100755
4--- a/glxgears_check.sh
5+++ b/glxgears_check.sh
6@@ -31,7 +31,7 @@ else
7
8 sleep 6
9
10- XPID=$( ps ax | awk '{print $1, $5}' | grep glxgears | awk '{print $1}')
11+ XPID=$( ps | awk '{print $1, $5}' | grep glxgears | awk '{print $1}')
12 if [ ! -z "$XPID" ]; then
13 kill -9 $XPID >/dev/null 2>&1
14 echo "glxgears can run, PASS!"
15diff --git a/x_close.sh b/x_close.sh
16index e287be1..3429f1a 100755
17--- a/x_close.sh
18+++ b/x_close.sh
19@@ -22,7 +22,7 @@
20 #
21 function close_proc(){
22 echo "kill process Xorg"
23-XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" | awk '{print $1}')
24+XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" | awk '{print $1}')
25 if [ ! -z "$XPID" ]; then
26 kill $XPID
27 sleep 4
28diff --git a/x_start.sh b/x_start.sh
29index 9cf6eab..2305796 100755
30--- a/x_start.sh
31+++ b/x_start.sh
32@@ -24,7 +24,7 @@
33 X_ERROR=0
34
35 #test whether X has started
36-PXID=$(ps ax |awk '{print $1,$5}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}')
37+PXID=$(ps |awk '{print $1,$6}' |egrep "Xorg$|X$" |grep -v grep | awk '{print $1}')
38 if [ ! -z "$PXID" ]; then
39 echo "[WARNING] Xorg has started!"
40 XORG_STATUS="started"
41@@ -35,9 +35,11 @@ else
42 #start up the x server
43 echo "Start up the X server for test in display $DISPLAY................"
44
45- $XORG_DIR/bin/X >/dev/null 2>&1 &
46+ #$XORG_DIR/bin/X >/dev/null 2>&1 &
47+ #sleep 8
48+ #xterm &
49+ /etc/init.d/xserver-nodm start &
50 sleep 8
51- xterm &
52 fi
53 XLOG_FILE=/var/log/Xorg.0.log
54 [ -f $XORG_DIR/var/log/Xorg.0.log ] && XLOG_FILE=$XORG_DIR/var/log/Xorg.0.log
55@@ -54,7 +56,7 @@ fi
56 X_ERROR=1
57 fi
58
59- XPID=$( ps ax | awk '{print $1, $5}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}')
60+ XPID=$( ps | awk '{print $1, $6}' | egrep "X$|Xorg$" |grep -v grep| awk '{print $1}')
61 if [ -z "$XPID" ]; then
62 echo "Start up X server FAIL!"
63 echo
64######## \ No newline at end of file