[Opensync-commits] r5271 - plugins/mozilla-sync/trunk/tests

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

Author: henrik
Date: Sun Feb 22 23:09:30 2009
New Revision: 5271
URL: http://www.opensync.org/changeset/5271

Log:
Make tests work on Debian (Lenny)

Modified:
   plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in
   plugins/mozilla-sync/trunk/tests/blackbox_test_init_sunbird.sh
   plugins/mozilla-sync/trunk/tests/blackbox_test_init_thunderbird.sh
   plugins/mozilla-sync/trunk/tests/blackbox_test_platform.sh

Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in
==============================================================================
--- plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in	Thu Feb 19 18:06:25 2009	(r5270)
+++ plugins/mozilla-sync/trunk/tests/blackbox_test_common.shinc.in	Sun Feb 22 23:09:30 2009	(r5271)
@@ -168,11 +168,10 @@
 
 	# Try to find the GRE directory
 	# This is an ugly hack, but what else can we do?
-	TB_EXE=`which thunderbird`
+	TB_EXE=`which thunderbird` || true
 	test -n "${TB_EXE}" || TB_EXE=`which icedove`
 	myecho "TB_EXE [${TB_EXE}]"
 	test -n "${TB_EXE}" || error_exit "Could not find Thunderbird" 1
-	
 	GRE_DIR=`grep moz_libdir "${TB_EXE}" | head -1 | cut -s -d "=" -f 2 | tr -d '"'`
 	test -n "${GRE_DIR}" || GRE_DIR=`grep MOZ_DIST_LIB "${TB_EXE}" | head -1 | cut -s -d "=" -f 2 | tr -d '"'`
 	test -n "${GRE_DIR}" || error_exit "Could not find GRE (Gecko Runtime Environment)" 1

Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_init_sunbird.sh
==============================================================================
--- plugins/mozilla-sync/trunk/tests/blackbox_test_init_sunbird.sh	Thu Feb 19 18:06:25 2009	(r5270)
+++ plugins/mozilla-sync/trunk/tests/blackbox_test_init_sunbird.sh	Sun Feb 22 23:09:30 2009	(r5271)
@@ -16,8 +16,8 @@
 initialize_test "Sunbird initialization"
 initialize_sunbird
 
-echo "sunbird --version"
-sunbird --version
+echo "${TB_EXE} --version"
+${TB_EXE} --version
 
 echo "ls -lR ${GRE_DIR}"
 ls -lR ${GRE_DIR}

Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_init_thunderbird.sh
==============================================================================
--- plugins/mozilla-sync/trunk/tests/blackbox_test_init_thunderbird.sh	Thu Feb 19 18:06:25 2009	(r5270)
+++ plugins/mozilla-sync/trunk/tests/blackbox_test_init_thunderbird.sh	Sun Feb 22 23:09:30 2009	(r5271)
@@ -16,8 +16,8 @@
 initialize_test "Thunderbird initialization"
 initialize_thunderbird
 
-echo "thunderbird --version"
-thunderbird --version
+echo "${TB_EXE} --version"
+${TB_EXE} --version
 
 echo "ls -lR ${GRE_DIR}"
 ls -lR ${GRE_DIR}

Modified: plugins/mozilla-sync/trunk/tests/blackbox_test_platform.sh
==============================================================================
--- plugins/mozilla-sync/trunk/tests/blackbox_test_platform.sh	Thu Feb 19 18:06:25 2009	(r5270)
+++ plugins/mozilla-sync/trunk/tests/blackbox_test_platform.sh	Sun Feb 22 23:09:30 2009	(r5271)
@@ -23,9 +23,9 @@
 lsb_release -a || true
 
 echo "thunderbird --version"
-thunderbird --version
+thunderbird --version || icedove --version
 
 echo "sunbird --version"
-sunbird --version
+sunbird --version || iceowl --version
 
 success_exit