[Opensync-commits] r6041 - plugins/ldap-sync/tests

[<svn...@op...>]

Author: scriptor
Date: Sun Feb 28 18:39:09 2010
New Revision: 6041
URL: http://www.opensync.org/changeset/6041

Log:
Small bug fixes and minor changes with the test scripts.

Modified:
   plugins/ldap-sync/tests/check_common.inc
   plugins/ldap-sync/tests/clean_up

Modified: plugins/ldap-sync/tests/check_common.inc
==============================================================================
--- plugins/ldap-sync/tests/check_common.inc	Sun Feb 28 18:38:49 2010	(r6040)
+++ plugins/ldap-sync/tests/check_common.inc	Sun Feb 28 18:39:09 2010	(r6041)
@@ -57,7 +57,7 @@
 	# a=$(ls -alR $osync_trace_dir)
 	# echo -e "$a"
 
-	echo -e "\n${FUNCNAME}(): Enabling trace files (OSYNC_TRACE and SYNCML_TRACE) for \"${test_name}\":\n$osync_trace_dir\n$syncml_trace_dir\n"
+	echo -e "\n\n${FUNCNAME}(): Enabling trace files (OSYNC_TRACE and SYNCML_TRACE) for \"${test_name}\":\n$osync_trace_dir\n$syncml_trace_dir\n\n"
 
 	export OSYNC_TRACE="$osync_trace_dir"
 	export SYNCML_TRACE="$syncml_trace_dir"
@@ -366,6 +366,8 @@
 			exit 1;
 		fi
 
+		echo -e "\n${FUNCNAME}(): VALGRIND = \"$VALGRIND\"\n"
+
 		export DART_TESTING_TIMEOUT="600"
 
 	else
@@ -1014,7 +1016,8 @@
 			templ=$(eval "$SOURCE_DIR/${member_config_file}.templ")
 			echo "${templ}" > "$BUILD_DIR/$member_config_file"
 		else
-			echo "${FUNCNAME}(): INFO: $SOURCE_DIR/${member_config_file}.templ could NOT be found."
+			echo "${FUNCNAME}(): INFO: $SOURCE_DIR/${member_config_file}.templ could NOT be found. Exiting."
+			exit 1;
 		fi
 
 
@@ -1027,9 +1030,13 @@
 		fi
 	fi
 
+	if test -z "$config_file"; then
+    echo "${FUNCNAME}(): ERROR: \$config_file is empty. Exiting.";
+    exit 1;
+  fi
 
 	if test ! -e "$config_file"; then
-		echo "${FUNCNAME}(): ERROR: $config_file does not exist. Exiting.";
+		echo "${FUNCNAME}(): ERROR: \$config_file = \"$config_file\" does not exist. Exiting.";
 		exit 1;
 	fi
 

Modified: plugins/ldap-sync/tests/clean_up
==============================================================================
--- plugins/ldap-sync/tests/clean_up	Sun Feb 28 18:38:49 2010	(r6040)
+++ plugins/ldap-sync/tests/clean_up	Sun Feb 28 18:39:09 2010	(r6041)
@@ -7,7 +7,6 @@
 # set -x
 
 FILE=$0
-PLUGINNAME="ldap-sync"
 SOURCE_DIR=`dirname $FILE`
 if test ! -d "$SOURCE_DIR"; then
   echo "$FILE:$LINENO: ERROR: \"$SOURCE_DIR\" is not a directory. Exiting."