Removal of unnecessary stuff from master

diff --git a/debian/Situare/usr/bin/Situare b/debian/Situare/usr/bin/Situare
deleted file mode 100755 (executable)
index a830655..0000000
Binary files a/debian/Situare/usr/bin/Situare and /dev/null differ

diff --git a/debian/situare/DEBIAN/control b/debian/situare/DEBIAN/control
deleted file mode 100644 (file)
index f845cbb..0000000
--- a/debian/situare/DEBIAN/control
+++ /dev/null
@@ -1,81 +0,0 @@
-Package: situare
-Version: 1.0-1
-Section: user/other
-Priority: extra
-Architecture: armel
-Installed-Size: 40
-Maintainer: Jukka Saastamoinen <jukka.saastamoinen@ixonos.com>
-Description: This is the Situare client for Maemo
- This application is done with Qt, requires Qt4.6.2 libraries
-Maemo-Icon-26: 
- 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
- fJ5/DP4/7f8A9z7iC7WTvksAAAAASUVORK5CYII

diff --git a/debian/situare/DEBIAN/md5sums b/debian/situare/DEBIAN/md5sums
deleted file mode 100644 (file)
index 0a0e22e..0000000
--- a/debian/situare/DEBIAN/md5sums
+++ /dev/null
@@ -1,2 +0,0 @@
-8c7083f125b902bd501890c05ca030ba  usr/share/doc/situare/copyright
-287ad157edc49b37b8f3947f9c170c87  usr/share/doc/situare/README.Debian

diff --git a/debian/situare/usr/share/doc/situare/README.Debian b/debian/situare/usr/share/doc/situare/README.Debian
deleted file mode 100644 (file)
index 55c3210..0000000
--- a/debian/situare/usr/share/doc/situare/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-situare for Debian
-------------------
-
-<possible notes regarding this package - if none, delete this file>
-
- -- unknown <jukka.saastamoinen@ixonos.com>  Wed, 31 Mar 2010 10:36:08 +0300

diff --git a/debian/situare/usr/share/doc/situare/copyright b/debian/situare/usr/share/doc/situare/copyright
deleted file mode 100644 (file)
index 8c1771a..0000000
--- a/debian/situare/usr/share/doc/situare/copyright
+++ /dev/null
@@ -1,35 +0,0 @@
-This package was debianized by unknown <jukka.saastamoinen@ixonos.com> on
-Wed, 31 Mar 2010 10:36:08 +0300.
-
-It was downloaded from <fill in http/ftp site>
-
-Upstream Author: <put author(s) name and email here>
-
-Copyright: <put the year(s) of the copyright, and the names of the
-            copyright holder(s) here>
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2010, unknown <jukka.saastamoinen@ixonos.com> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.

diff --git a/scripts/master_test_script.sh b/scripts/master_test_script.sh
old mode 100755 (executable)
new mode 100644 (file)
index 52cc33a..0f80199
--- a/scripts/master_test_script.sh
+++ b/scripts/master_test_script.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [$1 -eq ""]; then
+   echo "Usage of the script: ./master_test_script.sh destination_folder_for_test_reports tests_folder_location"
+else
 ##########################################################
 # This script is executed from /scripts directory        #
 # in situare project folder                              #
@@ -11,12 +14,16 @@ echo "As a final step, it creates summary report from all tests executed."
 #Environment settings                                   #
 ##########################################################
 #Store all directory names to a list
-MODULES=(`ls ../tests/`)
 #Modify these paths to point to correct path
-location=$HOME/situare/repository/situare/tests/
-FILE=$HOME/situare/repository/situare/reports/tests_summary.txt
-if [ ! -e $FILE ]; then
-    touch tests_summary.txt
+location=$2
+echo $location
+echo "Tests situate at: $location"
+
+TEST_REPORT=$1
+echo "Directory to store test report: $1"
+#cd $location
+if [ ! -e $1/tests_summary.txt ]; then
+    touch $1/tests_summary.txt
     echo "##########################################" >> tests_summary.txt
     echo "# Summary of unit tests executed         #" >> tests_summary.txt
     echo "# Date: `date`    #" >> tests_summary.txt
@@ -24,13 +31,23 @@ if [ ! -e $FILE ]; then
     echo "##########################################" >> tests_summary.txt
 fi  
 
+FILE=$1/tests_summary.txt
+cd $location
+MODULES=(`ls`)
+echo $MODULES
+
+for component in "${MODULES[@]}"
+do 
+  echo "Found test directory: $component"
+done
+
 ##########################################################
 #First part: Execution of all tests                      #
 ##########################################################
 for component in "${MODULES[@]}" #Loop through components
 do
   cd $location/$component
-  CASES=(`ls`) #List all test cases uner component directory
+  CASES=(`ls`) #List all test cases under component directory
   for unittest in "${CASES[@]}"
   do
     cd $location/$component/$unittest
@@ -61,4 +78,5 @@ do
     grep Totals *.txt >> $FILE
   done
 done
+fi
 exit 0