[asterisk-commits] pabelanger: branch pabelanger/issue17165 r280271 - in /team/pabelanger/issue1...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Jul 28 16:13:32 2010
New Revision: 280271

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280271
Log:
302 redirect to testsuite team branch.  Update configure with new --enable-testsuite flag. When enabled, you now require
SIPp, lua5.1 and lua5.1-dev to be installed, else configure will error.

Modified:
    team/pabelanger/issue17165/   (props changed)
    team/pabelanger/issue17165/configure
    team/pabelanger/issue17165/configure.ac
    team/pabelanger/issue17165/contrib/testsuite/build-asterisk
    team/pabelanger/issue17165/makeopts.in

Propchange: team/pabelanger/issue17165/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Wed Jul 28 16:13:32 2010
@@ -1,2 +1,2 @@
 menuselect https://origsvn.digium.com/svn/menuselect/trunk
-testsuite https://origsvn.digium.com/svn/testsuite/asterisk/trunk
+testsuite https://origsvn.digium.com/svn/testsuite/asterisk/team/pabelanger/non-root

Modified: team/pabelanger/issue17165/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17165/configure.ac?view=diff&rev=280271&r1=280270&r2=280271
==============================================================================
--- team/pabelanger/issue17165/configure.ac (original)
+++ team/pabelanger/issue17165/configure.ac Wed Jul 28 16:13:32 2010
@@ -298,6 +298,37 @@
 	      *) AC_MSG_ERROR(bad value ${enableval} for --enable-coverage)  ;;
 	esac])
 AC_SUBST(AST_CODE_COVERAGE)
+
+AST_TESTSUITE=no
+AC_ARG_ENABLE([testsuite],
+	[AS_HELP_STRING([--enable-testsuite],
+		[Turn on testsuite])],
+	[case "${enableval}" in
+		y|ye|yes) AST_TESTSUITE=yes ;;
+		n|no) AST_TESTSUITE=no ;;
+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-testsuite) ;;
+	esac])
+AC_SUBST(AST_TESTSUITE)
+
+if test "x${AST_TESTSUITE}" = "xyes" ; then
+	AC_PATH_PROG([SIPP], [sipp], :)
+	if test "x${SIPP}" = "x:" ; then
+		AC_MSG_NOTICE([**********************************************************************])
+		AC_MSG_NOTICE([*** It appears you do not have the SIPp package installed. It is   ***])
+		AC_MSG_NOTICE([*** REQUIRED to completly run the testsuite.  Please install it!   ***]) 
+		AC_MSG_NOTICE([**********************************************************************])
+		exit 1
+	fi
+
+	AC_PATH_PROG([LUAC], [luac], :)
+	if test "x${LUAC}" = "x:" ; then
+		AC_MSG_NOTICE([**********************************************************************])
+		AC_MSG_NOTICE([*** It appears you do not have the lua5.1 package installed. It is ***])
+		AC_MSG_NOTICE([*** REQUIRED to completly run the testsuite.  Please install it!   ***]) 
+		AC_MSG_NOTICE([**********************************************************************])
+		exit 1
+	fi
+fi
 
 # AST_EXT_LIB_SETUP is used to tell configure to handle variables for
 # various packages.
@@ -1741,6 +1772,15 @@
 	else
 		LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1"
 	fi
+else
+	if test "x${AST_TESTSUITE}" = "xyes" ; then
+		AC_MSG_NOTICE([**********************************************************************])
+		AC_MSG_NOTICE([*** It appears you do not have the lua5.1-dev package installed.   ***])
+		AC_MSG_NOTICE([*** it is REQUIRED to completly run the testsuite.  Please install ***]) 
+		AC_MSG_NOTICE([*** it.                                                            ***])
+		AC_MSG_NOTICE([**********************************************************************])
+		exit 1
+	fi
 fi
 	
 # Some distributions (like SuSE) remove the 5.1 suffix.

Modified: team/pabelanger/issue17165/contrib/testsuite/build-asterisk
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17165/contrib/testsuite/build-asterisk?view=diff&rev=280271&r1=280270&r2=280271
==============================================================================
--- team/pabelanger/issue17165/contrib/testsuite/build-asterisk (original)
+++ team/pabelanger/issue17165/contrib/testsuite/build-asterisk Wed Jul 28 16:13:32 2010
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AST_CONFIGURE_PARAMS=--enable-dev-mode
+AST_CONFIGURE_PARAMS=--enable-dev-mode --enable-testsuite
 AST_LIVE=./live/
 TEST_RESULTS_DIR=${PWD}/test-reports
 
@@ -146,3 +146,4 @@
 	stop_asterisk
 fi
 
+

Modified: team/pabelanger/issue17165/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/issue17165/makeopts.in?view=diff&rev=280271&r1=280270&r2=280271
==============================================================================
--- team/pabelanger/issue17165/makeopts.in (original)
+++ team/pabelanger/issue17165/makeopts.in Wed Jul 28 16:13:32 2010
@@ -81,6 +81,10 @@
 
 AST_CODE_COVERAGE=@AST_CODE_COVERAGE@
 
+AST_TESTSUITE=@AST_TESTSUITE@
+SIPP=@SIPP@
+LUAC=@LUAC@
+
 AST_DECLARATION_AFTER_STATEMENT=@AST_DECLARATION_AFTER_STATEMENT@
 AST_NO_STRICT_OVERFLOW=@AST_NO_STRICT_OVERFLOW@
 AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@