[brlcad-commits] SF.net SVN: brlcad:[41569] brlcad/trunk/sh/conversion.sh

[<r_...@us...>]

Revision: 41569
          http://brlcad.svn.sourceforge.net/brlcad/?rev=41569&view=rev
Author:   r_weiss
Date:     2010-12-08 22:55:12 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
Updated the 'conversion.sh' script. Removed the 'conversion time limit exceeded' log messages. When the time limit is exceeded it now shows 'extl' next to either 'bot' or 'nmg' instead of 'fail'. I did this to make is easier to compare between runs of the script, i.e. reading the 'diff' is a little easier. I also changed capitalization of some messages just for consistency and to simplify running 'grep' on the log. I am sure there is a better way to make these changes to the script but it appears to work without problems.

Modified Paths:
--------------
    brlcad/trunk/sh/conversion.sh

Modified: brlcad/trunk/sh/conversion.sh
===================================================================
--- brlcad/trunk/sh/conversion.sh	2010-12-08 22:54:51 UTC (rev 41568)
+++ brlcad/trunk/sh/conversion.sh	2010-12-08 22:55:12 UTC (rev 41569)
@@ -383,11 +383,11 @@
 	# leaving orphaned 'sleep' processes that accumualte, this
 	# method had to be executed in the current shell environment.
 
-	{ sleep $MAXTIME && test "x`ps auxwww | grep "$work" | grep facetize | grep "${obj}.nmg" | awk '{print $2}'`" != "x" && $ECHO "\tNMG conversion time limit exceeded: $file:$object" && kill -9 `ps auxwww | grep "$work" | grep facetize | grep "${obj}.nmg" | awk '{print $2}'` 2>&4 & } 4>&2 2>/dev/null
+	{ sleep $MAXTIME && test "x`ps auxwww | grep "$work" | grep facetize | grep "${obj}.nmg" | awk '{print $2}'`" != "x" && `touch "./${obj}.nmg.extl"` && kill -9 `ps auxwww | grep "$work" | grep facetize | grep "${obj}.nmg" | awk '{print $2}'` 2>&4 & } 4>&2 2>/dev/null
         spid=$!
 
 	# convert NMG
-	nmg=FAIL
+	nmg=fail
 	cmd="$GED -c "$work" facetize -n \"${obj}.nmg\" \"${obj}\""
 	$VERBOSE_ECHO "\$ $cmd"
 	output=`eval time $cmd 2>&1 | grep -v Using`
@@ -416,13 +416,17 @@
 	    nmg=pass
 	    nmg_count=`expr $nmg_count + 1`
 	fi
+	if [ -e "./${obj}.nmg.extl" ] ; then
+            `rm "./${obj}.nmg.extl"`
+	    nmg=extl
+	fi
 
 	# start the limit timer, same as above.
-	{ sleep $MAXTIME && test "x`ps auxwww | grep "$work" | grep facetize | grep "${obj}.bot" | awk '{print $2}'`" != "x" && $ECHO "\tBoT conversion time limit exceeded: $file:$object" && kill -9 `ps auxwww | grep "$work" | grep facetize | grep "${obj}.bot" | awk '{print $2}'` 2>&4 & } 4>&2 2>/dev/null
+	{ sleep $MAXTIME && test "x`ps auxwww | grep "$work" | grep facetize | grep "${obj}.bot" | awk '{print $2}'`" != "x" && `touch "./${obj}.bot.extl"` && kill -9 `ps auxwww | grep "$work" | grep facetize | grep "${obj}.bot" | awk '{print $2}'` 2>&4 & } 4>&2 2>/dev/null
         spid=$!
 
 	# convert BoT
-	bot=FAIL
+	bot=fail
 	cmd="$GED -c "$work" facetize \"${obj}.bot\" \"${obj}\""
 	$VERBOSE_ECHO "\$ $cmd"
 	output=`eval time $cmd 2>&1 | grep -v Using`
@@ -446,11 +450,15 @@
 	    bot=pass
 	    bot_count=`expr $bot_count + 1`
 	fi
+	if [ -e "./${obj}.bot.extl" ] ; then
+            `rm "./${obj}.bot.extl"`
+	    bot=extl
+	fi
 
 	# print result for this object
-	status=FAIL
+	status=fail
 	if test "x$nmg" = "xpass" && test "x$bot" = "xpass" ; then
-	    status=OK
+	    status=ok
 	fi
 
 	count=`expr $count + 1`


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