Author: sebastien.lelong
Date: Wed Jul 8 05:01:22 2009
New Revision: 1095
Added:
trunk/tools/build/unittest.sh (contents, props changed)
Modified:
trunk/tools/build/compile.sh
trunk/tools/build/validate.sh
trunk/tools/jallib.py
Log:
add unittest step for buildbot
Modified: trunk/tools/build/compile.sh
==============================================================================
--- trunk/tools/build/compile.sh (original)
+++ trunk/tools/build/compile.sh Wed Jul 8 05:01:22 2009
@@ -45,8 +45,8 @@
fi
echo JALLIB_ROOT=$JALLIB_ROOT
-echo JALLIB_REPOS=$JALLIB_ROOT/include
-echo JALLIB_SAMPLEDIR=$JALLIB_ROOT/sample
+echo JALLIB_REPOS=$JALLIB_REPOS
+echo JALLIB_SAMPLEDIR=$JALLIB_SAMPLEDIR
echo JALLIB_JALV2=$JALLIB_JALV2
echo JALLIB_PYTHON=$JALLIB_PYTHON
Added: trunk/tools/build/unittest.sh
==============================================================================
--- (empty file)
+++ trunk/tools/build/unittest.sh Wed Jul 8 05:01:22 2009
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+###export JALLIB_ROOT=`pwd` # correct when set by buildbot
+export JALLIB_ROOT=`pwd`/../.. # run manually here
+export JALLIB_REPOS=$JALLIB_ROOT/include
+export JALLIB_UNITTESTDIR=$JALLIB_ROOT/test/unittest
+
+jaltfiles=`find $JALLIB_UNITTESTDIR -name \*.jalt -type f`
+jalfiles=`find $JALLIB_UNITTESTDIR -name \*.jal -type f`
+
+echo `echo $jaltfiles $jalfiles | sed "s#\.jal #.jal\n#g" | sed "s#\.jalt
#.jalt\n#g" | wc -l` unittests to run...
+
+at_least_one_failed=0
+counter=0
+
+echo "" > /tmp/unittest.out
+echo "" > /tmp/unittest.failed
+
+for jalfile in `echo $jaltfiles $jalfiles`
+do
+ ###echo file: $jalfile...
+ $JALLIB_PYTHON $JALLIB_ROOT/tools/jallib.py unittest $jalfile >
/tmp/tmpval.out 2>&1
+ if [ "$?" != "0" ]
+ then
+ echo `basename $jalfile` >> /tmp/unittest.failed
+ echo -- `basename $jalfile` failed, run again with details --
>>
/tmp/unittest.out
+ $JALLIB_PYTHON $JALLIB_ROOT/tools/jallib.py unittest -v
$jalfile >
/tmp/tmpval.out 2>&1
+ cat /tmp/tmpval.out >> /tmp/unittest.out
+ echo -- -- -- >> /tmp/unittest.out
+ echo >> /tmp/unittest.out
+ at_least_one_failed=1
+ counter=`expr $counter + 1`
+ fi
+done
+
+if [ "$counter" = "0" ]
+then
+ echo "All unittests run with success :)"
+else
+ echo "$counter unittests has failed..."
+ echo List:
+ cat /tmp/unittest.failed
+ echo
+ echo
+ echo Details:
+ cat /tmp/unittest.out
+ echo
+fi
+
+echo "Environment config"
+echo JALLIB_ROOT=$JALLIB_ROOT
+echo JALLIB_REPOS=$JALLIB_REPOS
+echo JALLIB_UNITTESTDIR=$JALLIB_UNITTESTDIR
+echo JALLIB_JALV2=$JALLIB_JALV2
+echo JALLIB_PYTHON=$JALLIB_PYTHON
+
+
+
+rm -f /tmp/unittest.out
+exit $at_least_one_failed
Modified: trunk/tools/build/validate.sh
==============================================================================
--- trunk/tools/build/validate.sh (original)
+++ trunk/tools/build/validate.sh Wed Jul 8 05:01:22 2009
@@ -20,7 +20,7 @@
for jalfile in `echo $jalsamples $jallibs`
do
##echo -n file: $jalfile...
- $JALLIB_PYTHON $JALLIB_ROOT/tools/jallib.py validate $jalfile>
/tmp/tmpval.out 2>&1
+ $JALLIB_PYTHON $JALLIB_ROOT/tools/jallib.py validate $jalfile >
/tmp/tmpval.out 2>&1
if [ "$?" != "0" ]
then
echo -- jsg output -- >> /tmp/validate.out
@@ -49,8 +49,8 @@
echo "Environment config"
echo JALLIB_ROOT=$JALLIB_ROOT
-echo JALLIB_REPOS=$JALLIB_ROOT/include
-echo JALLIB_SAMPLEDIR=$JALLIB_ROOT/sample
+echo JALLIB_REPOS=$JALLIB_REPOS
+echo JALLIB_SAMPLEDIR=$JALLIB_SAMPLEDIR
echo JALLIB_JALV2=$JALLIB_JALV2
echo JALLIB_PYTHON=$JALLIB_PYTHON
Modified: trunk/tools/jallib.py
==============================================================================
--- trunk/tools/jallib.py (original)
+++ trunk/tools/jallib.py Wed Jul 8 05:01:22 2009
@@ -858,6 +858,8 @@
asm = filename.replace(".jal",".asm")
hex = filename.replace(".jal",".hex")
oracle = picshell_unittest(jal,asm,hex)
+ else:
+ oracle['failure'] = 1
finally:
clean_compiler_products(filename)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"jallib" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/jallib?hl=en
-~----------~----~----~----~------~----~------~--~---
