X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=scripts%2Frun_unit_tests.sh;h=fa2d8dd3ea9f779e0584622b43e234f74319c869;hb=59971e123b75430af242b79aff1e2d711625f499;hp=3641427533d631eb6f1e1da976d8c18cba72d5e9;hpb=62d3d5b4933658b2143625118f9b053dde4fec74;p=situare

diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh
index 3641427..fa2d8dd 100755
--- a/scripts/run_unit_tests.sh
+++ b/scripts/run_unit_tests.sh
@@ -9,6 +9,10 @@ REPORT_FILE="unit_test_results.txt"
 TEMP_FILE_EXEC_NOT_FOUND="temp_exec_not_found.txt"
 TEMP_REPORT_FILE="temp_report.txt"
 
+MAKE_OPTIONS="-j3 -k -s -w"
+
+SCRIPT_DIR=(`pwd`)
+
 # check that directories are found
 if [[ -d $REPORT_PATH && -d $UNIT_TESTS_ROOT_DIR ]]; then
     # convert relational paths to absolute ones
@@ -28,8 +32,8 @@ if [[ -d $REPORT_PATH && -d $UNIT_TESTS_ROOT_DIR ]]; then
     echo "##########################################" >> $REPORT
     echo "" >> $REPORT
 
-    # find all test .pro files pahts, cut .pro extension
-    UNIT_TEST_PROJECTS=(`find $UNIT_TESTS_ROOT_DIR_ABSOLUTE | egrep \.pro$ | sed -e s,[^/]pro,,g`)
+    # find all test .pro files paths, cut .pro extension
+    UNIT_TEST_PROJECTS=(`find $UNIT_TESTS_ROOT_DIR_ABSOLUTE | egrep \.pro$ | sed -e s,.pro$,,g`)
 
     echo "###################################################"
     echo "All unit test executables will be deleted"
@@ -49,7 +53,7 @@ if [[ -d $REPORT_PATH && -d $UNIT_TESTS_ROOT_DIR ]]; then
     # run qmake
     cd $UNIT_TESTS_ROOT_DIR_ABSOLUTE
     qmake -r
-    make
+    make $MAKE_OPTIONS
     cd -
 
     echo ""
@@ -67,11 +71,12 @@ if [[ -d $REPORT_PATH && -d $UNIT_TESTS_ROOT_DIR ]]; then
                 # go to unit test directory
                 cd "`echo $PROJECT | grep --perl-regexp -o .*\(?=/\)`"
                 # run unit test, save to temp file, ignore strerr stream
-                $PROJECT -silent -o $REPORT_PATH_ABSOLUTE/$TEMP_REPORT_FILE 2>&1 | grep -v "atk_object_set_name..assertion"
+                $PROJECT -silent -o $REPORT_PATH_ABSOLUTE/$TEMP_REPORT_FILE 2>&1 | grep -v -f $SCRIPT_DIR/filtering_patterns_for_unit_tests_output.txt
                 cd - > /dev/null
                 # print to screen and append to summary
                 cat $REPORT_PATH_ABSOLUTE/$TEMP_REPORT_FILE
                 cat $REPORT_PATH_ABSOLUTE/$TEMP_REPORT_FILE >> $REPORT_PATH_ABSOLUTE/$REPORT_FILE
+                echo ""
                 echo "" >> $REPORT_PATH_ABSOLUTE/$REPORT_FILE
             else
                 # save path of missing test to temporary file