see ChangeLog

git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/matchbox-tests@1000 b067294f-1dea-0310-9683-c47a78595994

ChangeLog

@@ -1,3 +1,18 @@
+2005-01-07  mallum,,,  <mallum@openedhand.com>
+
+	* test-interaction-640x480.xnee:
+	* test-interaction.sh:
+	Update interaction to get move converage. 
+	Fix xnee opts to ignore dubious sync errors
+
+	* test-theme/theme.xml:
+	Add horiz+vert gradients to theme
+
+	* test.conf:
+
+	* testrun.sh:
+	
+
 2004-07-19  Matthew Allum,,,  <mallum@handhelds.org>
 
 	* argbtest.c: (main):

test-interaction.sh

@@ -41,12 +41,12 @@ fi
 
 if [ ! -f "test-interaction-$XNEST_GEOM.xnee" ]; then
    echo "$0: test-interaction-$XNEST_GEOM.xnee playback data missing"
-   exit 2
+#   exit 2
 fi
 
 if [ ! -f "test-interaction-$XNEST_GEOM.xwd" ]; then
    echo "$0: test-interaction-$XNEST_GEOM.xwd comparison image missing"
-   exit 2
+#   exit 2
 fi
 
 # mbtest theme now used.
@@ -54,12 +54,29 @@ fi
 
 matchbox-remote -t mbtest
 
+if [ -z $(which matchbox-desktop) ]; then
+  echo "$0: please install matchbox-desktop for running this test!"
+fi 
+
+if [ -z $(which gedit) ]; then
+  echo "$0: please install gedit for running this test!"
+fi 
+
 # Launch various window types. 
-(matchbox-desktop || echo "*** Unable to start matchbox-desktop - is it installed?") &
+matchbox-desktop &
+sleep 1
+
+# gedit is really needed to push some of the ewmh stuff
+gedit &
+
+sleep 1
 
 ./winspew -np -t "Window",normal 2>&1 > /dev/null &
+sleep 1
 ./winspew -np -t "Window",dock,+0+300 2>&1 > /dev/null &
+sleep 1
 ./winspew -np -t "Window",toolbar 2>&1 > /dev/null &
+sleep 1
 
 ## Add some sleeps to avoid race where final display order can differ...
 sleep 1
@@ -73,9 +90,12 @@ sleep 1
 # To create your own 'recording', use something like the below with 
 # ctrl-c to stop.
 #
-# xnee -ae -o test-interaction.xnee -l -1
+#
+#xnee -rec -ae -o test-interaction-640x480.xnee -l -1
+#
+#exit
 
-xnee -rep -f test-interaction-$XNEST_GEOM.xnee 2>&1 > /dev/null
+xnee -rep -fp -f test-interaction-$XNEST_GEOM.xnee 2>&1 > /dev/null
 
 # hack.. sleep for a couple of seconds and fire a xrefresh
 # maybe some xnee events still queued ..
@@ -125,7 +145,7 @@ rm -f $SHOT
 #xwd -root -out ./test-interaction.xwd
 xwd -root -out $SHOT
 
-killall winspew
+killall winspew matchbox-desktop gedit
 
 file_compare ./test-interaction-$XNEST_GEOM.xwd $SHOT
 if [ -z "$ret" ]; then

test-theme/theme.xml

@@ -55,6 +55,16 @@
   <layer x="-5" y="0" w="object" h="object" 
    type="pixmap" pixmap="titleright" />
 
+  <layer x="0" y="0" w="100%"  h="100%" 
+   type="plain" color="bgcol" />
+
+  <layer x="50%" y="0" w="20"  h="100%" 
+   type="gradient-vert" startcol="red" endcol="black"/>
+
+  <layer x="50%+20" y="0" w="20"  h="100%" 
+   type="gradient-horiz" startcol="black" endcol="red"/>
+
+
   <layer x="14" y="1" w="100%-60" h="20" 
    type="label" color="black" justify="left" font="titlefont" />
 

test.conf

@@ -4,7 +4,7 @@
 THEME=mbtest
 
 # Geometry of Xnest, can also  be 640x480, 240x320
-XNEST_GEOM=240x320
+XNEST_GEOM=640x480
 
 # Use valgrind y/n ?
 VALGRIND_USAGE=n
@@ -16,10 +16,10 @@ VALGRIND_ARGS="--error-limit=no --num-callers=32 --leak-check=yes"
 MATCHBOX_ARGS=
 
 # Full path of matchbox binary to test
-MATCHBOX_EXE=$(which matchbox-window-manager)
+MATCHBOX_EXE="matchbox-window-manager"
 
 # Display to connect to.
-DPY_NUM=:3
+DPY_NUM=:1
 
 # Where to write logs to
 LOGS=./logs

testrun.sh

@@ -68,7 +68,7 @@ if [ ! -f $CONF_FILE ]; then
 fi
 source $CONF_FILE
 
-if [ -z $(which matchbox|grep "/matchbox") ]; then
+if [ -z $(which matchbox-window-manager) ]; then
    echo "ERROR: 'matchbox' binaries missing!"
    echo
    echo "Either build/install Matchbox first or set the path correctly, e.g:"