[Morphix-cvs] SF.net SVN: morphix: [2196] trunk/mmaker/utils/auto-testing

[<bms...@us...>]

Revision: 2196
Author:   bmsleight
Date:     2006-04-03 12:05:32 -0700 (Mon, 03 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/morphix/?rev=2196&view=rev

Log Message:
-----------
--dry-run is only needed when testing a scipt. Doh\!

Modified Paths:
--------------
    trunk/mmaker/utils/auto-testing/AutoTestingMini.xml
    trunk/mmaker/utils/auto-testing/cat_file.sh
    trunk/mmaker/utils/auto-testing/run_testing.sh
Modified: trunk/mmaker/utils/auto-testing/AutoTestingMini.xml
===================================================================
--- trunk/mmaker/utils/auto-testing/AutoTestingMini.xml	2006-04-03 18:20:17 UTC (rev 2195)
+++ trunk/mmaker/utils/auto-testing/AutoTestingMini.xml	2006-04-03 19:05:32 UTC (rev 2196)
@@ -15,8 +15,9 @@
      <command>echo " * Using AutoTesting Mini Module"</command>
     </preX>
     <X>         <!-- Commands to run in X windows -->
+     <command>xset s reset </command> <!-- Reset screensaver if on -->
+     <command>xset s off   </command> <!--- Screensaver off        -->
      <command>firefox http://www.google.com &amp; </command>
-<!--     <command>sleep 60</command> --> <!-- As xmessage runs and terminates quickly, wait until x is settled until running next command -->
      <command>/bin/bash $1/morphix/files/cat_file.sh</command>
     </X>
     <postX>     <!-- Commands to run after X windows shutdown -->

Modified: trunk/mmaker/utils/auto-testing/cat_file.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/cat_file.sh	2006-04-03 18:20:17 UTC (rev 2195)
+++ trunk/mmaker/utils/auto-testing/cat_file.sh	2006-04-03 19:05:32 UTC (rev 2196)
@@ -8,7 +8,7 @@
 TITLEH="AUTO-TESTING DEBUG INFORMATION" 
 TITLED="------------------------------------------------------- "
 TITLEF="FINISHED DEBUG IFORMATION"
-SLEEPS=8
+SLEEPS=12
 DIS_LINES=40
 
 mkdir /tmp/debug

Modified: trunk/mmaker/utils/auto-testing/run_testing.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/run_testing.sh	2006-04-03 18:20:17 UTC (rev 2195)
+++ trunk/mmaker/utils/auto-testing/run_testing.sh	2006-04-03 19:05:32 UTC (rev 2196)
@@ -44,9 +44,9 @@
 find /home/morph/autobuilds/mainmod/sarge/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
 find /home/morph/autobuilds/mainmod/sid/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
 find /home/morph/autobuilds/base/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
-rsync --dry-run -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/
-rsync --dry-run -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/
-rsync --dry-run -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/
+rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/base/*$TODAY* /home/morph/autobuilds/base/
+rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sid/*$TODAY* /home/morph/autobuilds/mainmod/sid/
+rsync -avz --delete-before -e ssh mo...@lo...:morphixorg/autobuilds/mainmod/sarge/*$TODAY* /home/morph/autobuilds/mainmod/sarge/
 
 find /home/morph/videos/ -not -type d -mtime +4 -print0 | xargs --null --no-run-if-empty sudo rm -f
 
@@ -63,7 +63,7 @@
 find $STORE_AT_MM/ -not -type d -mtime +1 -print0 | xargs --null --no-run-if-empty sudo rm -f
 rm $STORE_AT_MM/index.html*		1>/dev/null 2>&1
 wget_cl() {
-	wget --non-verbose --tries=3 --timeout=60 --directory-prefix=$1 $2
+	wget --no-verbose --tries=3 --timeout=60 --directory-prefix=$1 $2
 	}
 wget_cl "$STORE_AT_MM" "$REMOTE_AT_MM/"
 if [ -e  $STORE_AT_MM/index.html ]
@@ -135,7 +135,7 @@
       echo $DIVIDER
       echo "Run auto_testing"
       echo $TITLED
-      sudo /home/morph/morphix/trunk/mmaker/utils/auto-testing/auto_testing.sh $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.avi  540
+      sudo /home/morph/morphix/trunk/mmaker/utils/auto-testing/auto_testing.sh $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN $VID_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN.avi  600
       sudo rm $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
       echo $TMP_ISO_DIR/$TMP_MAINMODS_BN'_'$TMP_BASES_BN
       gzip -c $LOG_FILE >$VID_DIR/$LOG_FILE_BN'_'$TODAY'_.gz'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.