From: Razvan Deaconescu <razvan.deaconescu@cs.pub.ro>
Date: Fri, 6 Aug 2010 14:45:49 +0000 (+0300)
Subject: ControlScripts: working version of parse_* scripts with pre-run/post-run script-awareness
X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=4f1019e87e3c84bbb6cd28aea265fe5c171c1285;p=p2p-testing-infrastructure.git

ControlScripts: working version of parse_* scripts with pre-run/post-run script-awareness
---

diff --git a/ControlScripts/parse_client_log.sh b/ControlScripts/parse_client_log.sh
index 81371ea..dbad40e 100755
--- a/ControlScripts/parse_client_log.sh
+++ b/ControlScripts/parse_client_log.sh
@@ -11,21 +11,19 @@
 # use _DEBUG="off" to turn off debug printing
 _DEBUG="on"
 
-if test $# -ne 2; then
-	echo "usage: $0 log-folder log-file" 1>&2
+if test $# -ne 3; then
+	echo "usage: $0 client-type log-folder log-file" 1>&2
 	exit 1
 fi
 
 # Read the global configuration variables
 source ../ConfigFiles/globalconfig
 
-# Read scenarion configuration file (CLIENT_TYPE)
-source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config
-
 # Read client mappings configuration file
 source ../ConfigFiles/client_script_mappings
 
-log_folder=$1
-log_file=$2
+client_type=$1
+log_folder=$2
+log_file=$3
 
-parse_client_log ${CLIENT_TYPE} ${log_folder} ${log_file}
+parse_client_log ${client_type} ${log_folder} ${log_file}
diff --git a/ControlScripts/parse_hrk.sh b/ControlScripts/parse_hrk.sh
index 863e36d..9b57ce6 100755
--- a/ControlScripts/parse_hrk.sh
+++ b/ControlScripts/parse_hrk.sh
@@ -8,7 +8,6 @@
 #  * a folder where the log and data files are stored
 #  * the name of a log file in that folder
 
-
 if [ ! $# -eq 2 ]; then
 	echo "usage: $0 log-folder log-file"
 	exit 1