[Dmcs-notify] SF.net SVN: dmcs:[3294] dmcs/branches/dmcs1.5/examples/test

[<mm...@us...>]

Revision: 3294
          http://dmcs.svn.sourceforge.net/dmcs/?rev=3294&view=rev
Author:   mmsc
Date:     2012-11-21 16:21:13 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Update scripts.

Modified Paths:
--------------
    dmcs/branches/dmcs1.5/examples/test/runTest.sh
    dmcs/branches/dmcs1.5/examples/test/tables.py

Modified: dmcs/branches/dmcs1.5/examples/test/runTest.sh
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/runTest.sh	2012-11-21 10:48:28 UTC (rev 3293)
+++ dmcs/branches/dmcs1.5/examples/test/runTest.sh	2012-11-21 16:21:13 UTC (rev 3294)
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 DOECHO=yes
-WANTLOG=yes
+WANTLOG=no
+MAXTRY=4
 EMA...@kr...
 
 testpack[0]="all"
@@ -70,20 +71,37 @@
 	wantOpt=-opt
     fi
 
-    echo "Run "$teName $tpack $runOpt
-    bash $toName-command-line$wantOpt-$tpack$wantlog.sh
-    RETVAL=$?
-    echo $RETVAL
+    for (( i = 1; i <= $MAXTRY; ++i)) ; do
+	if [ $i -eq 1 ] ; then
+	    echo "Run "$teName $tpack $runOpt
+	else
+	    echo "Retry($i) "$teName $tpack $runOpt
+	fi
 
-    if [ $RETVAL = 0 ] ; then
-	echo "PASSED: $teName $tpack $runOpt" > $toName-status.log
-	echo $toName,$teName,$tpack,$runOpt >> $basedir/passedtests.log
-	(cat $toName-time.log ; echo ; cat $toName.log ; echo ; cat $toName-err.log) | mail -s "PASSED: dmcs testcase on GLUCK: $teName $tpack $runOpt" $EMAIL
-    else
-	echo "FAILED: $teName $tpack $runOpt" > $toName-status.log
-	echo $toName,$teName,$tpack,$runOpt >> $basedir/$filename
-	(cat $toName-time.log ; echo ; cat $toName.log ; echo ; cat $toName-err.log) | mail -s "FAILED: dmcs testcase on GLUCK: $teName $tpack $runOpt" $EMAIL
-    fi
+	bash $toName-command-line$wantOpt-$tpack$wantlog.sh
+	RETVAL=$?
+	echo $RETVAL
+	
+	if [ $RETVAL -eq 0 ] ; then
+	    echo "PASSED: $teName $tpack $runOpt" > $toName-status.log
+	    echo $toName,$teName,$tpack,$runOpt >> $basedir/passedtests.log
+	    (cat $toName-time.log ; echo ; cat $toName.log ; echo ; cat $toName-err.log) | mail -s "PASSED: dmcs testcase on GLUCK: $teName $tpack $runOpt" $EMAIL
+	    break
+	elif [ $RETVAL -eq 124 ] ; then
+	    echo "TIMEOUT: $teName $tpack $runOpt" > $toName-status.log
+	    echo $toName,$teName,$tpack,$runOpt >> $basedir/timeouttests.log
+	    (cat $toName-time.log ; echo ; cat $toName.log ; echo ; cat $toName-err.log) | mail -s "TIMEOUT: dmcs testcase on GLUCK: $teName $tpack $runOpt" $EMAIL
+	    break
+	else
+	    if [ $i -eq $MAXtRY ] ; then
+		echo "FAILED: $teName $tpack $runOpt" > $toName-status.log
+		echo $toName,$teName,$tpack,$runOpt >> $basedir/$filename
+		(cat $toName-time.log ; echo ; cat $toName.log ; echo ; cat $toName-err.log) | mail -s "FAILED: dmcs testcase on GLUCK: $teName $tpack $runOpt" $EMAIL
+	    else
+		(cat $toName-time.log ; echo ; cat $toName.log ; echo ; cat $toName-err.log) | mail -s "FAILED($i): dmcs testcase on GLUCK: $teName $tpack $runOpt" $EMAIL
+	    fi
+	fi
+    done
 
     moveLogFiles $toName $teName $tpack $runOpt
 } # end of runOneInstance

Modified: dmcs/branches/dmcs1.5/examples/test/tables.py
===================================================================
--- dmcs/branches/dmcs1.5/examples/test/tables.py	2012-11-21 10:48:28 UTC (rev 3293)
+++ dmcs/branches/dmcs1.5/examples/test/tables.py	2012-11-21 16:21:13 UTC (rev 3294)
@@ -125,6 +125,14 @@
 
 
 
+def peek(outcomes):
+    for oc in outcomes:
+        print oc[0][0]
+
+    print "\n"
+
+
+
 def ordered_push(outcomes, outcome, sorted_testcases, testcase):
     if outcomes == []:
         outcomes.append(outcome)
@@ -132,18 +140,28 @@
     else:
         i = 0
         new_val = float(outcome[0][0])
+        found = False
+
         while i < len(outcomes):
             old_val = float(outcomes[i][0][0])
             i = i + 1
+            print "Compare: " + str(old_val) + " and " + str(new_val)
             if old_val > new_val:
+                found = True
                 break
-        outcomes.insert(i-1, outcome)
-        sorted_testcases.insert(i-1, testcase)
 
+        if found == True:
+            outcomes.insert(i-1, outcome)
+            sorted_testcases.insert(i-1, testcase)
+        else:
+            outcomes.insert(i, outcome)
+            sorted_testcases.insert(i, testcase)
 
+        peek(outcomes)
 
+
 def process_test_cases(toponame, testpacks, current_test_case):
-    outcomes = []
+    outcomes = [ ]
     sorted_testcases = []
 
     test_runs = []
@@ -182,8 +200,8 @@
         outcome = outcomes[i]
         instance = sorted_testcases[i]
 
-        print len(outcome)
-        print instance
+        #print len(outcome)
+        #print instance
         mem = topo + '-' + instance[1] + '-' + instance[2] + '-' + instance[3] + '-' + instance[4] + '-' + instance[5] 
         str_i = '{' + str(i+1) + '}'
 
@@ -249,10 +267,10 @@
                               outcomes, sorted_testcases,
                               topo, topo_abbreviation[topo])
 
-                print outcomes
-                print "\n"
-                print sorted_testcases
-                print "\n"
+                #print outcomes
+                #print "\n"
+                #print sorted_testcases
+                #print "\n"
 
                 if line == "":
                     break

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