From ad9a7226f735bf49d39d320db7c49088e4f1d17e Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 31 May 2012 14:16:43 -0400
Subject: [PATCH] * #11848: hudson don't run tests twice

make check will run the tests itself
---
 hudson-sflphone-script.sh | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/hudson-sflphone-script.sh b/hudson-sflphone-script.sh
index f7e367ddbc..b92a3555be 100755
--- a/hudson-sflphone-script.sh
+++ b/hudson-sflphone-script.sh
@@ -60,17 +60,6 @@ function gen_doxygen {
 	fi
 }
 
-
-function launch_unit_test_daemon {
-        # Run the unit tests for the daemon
-        pushd daemon/test
-        # Remove the previous XML test file
-        rm -rf $XML_RESULTS
-        ./run_tests.sh || exit 1
-        popd
-}
-
-
 function launch_functional_test_daemon {
         # Run the python functional tests for the daemon
 
@@ -136,6 +125,8 @@ function build_daemon {
 	if [ $DOXYGEN == 1 ]; then
 		gen_doxygen
 	fi
+	# Remove the previous XML test file
+	rm -rf $XML_RESULTS
 	# Compile unit tests
 	make check
 	popd
@@ -204,7 +195,6 @@ done
 build_$BUILD
 
 if [ $TEST == 1 ]; then
-    # launch_unit_test_daemon
     launch_functional_test_daemon
 fi
 
-- 
GitLab