[asterisk-commits] Improvements for ./run-local setup. (testsuite[master])

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Jun 8 08:11:07 CDT 2015


Matt Jordan has submitted this change and it was merged.

Change subject: Improvements for ./run-local setup.
......................................................................


Improvements for ./run-local setup.

This change allows setting an alternate source directory using the
variable ASTSRCDIR.  If unset or blank it defaults to the location
previously used, "..".

This also adds support for ./tests/custom to define setup actions.
If the script ./tests/custom/custom-setup exists, it will be run
after installation of Asterisk.

Change-Id: I85b525b6069ffdc4ff5fecab2151bf2d0cacbf36
---
M run-local
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  Joshua Colp: Looks good to me, but someone else must approve



diff --git a/run-local b/run-local
index 3844cc6..5371c1e 100755
--- a/run-local
+++ b/run-local
@@ -20,7 +20,10 @@
 		make install DESTDIR="$HERE/astroot"
 	)
 	(
-		cd ..
+		if test -z $ASTSRCDIR; then
+			ASTSRCDIR=..
+		fi
+		cd $ASTSRCDIR
 		# The user may have already run ./configure and make
 		if [ ! -f config.status ]; then
 			./configure --enable-dev-mode
@@ -30,6 +33,9 @@
 		make
 		make install samples DESTDIR="$HERE/astroot"
 	)
+	if [ -x tests/custom/custom-setup ]; then
+		./tests/custom/custom-setup
+	fi
 }
 
 mktemp_symlink() {

-- 
To view, visit https://gerrit.asterisk.org/599
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I85b525b6069ffdc4ff5fecab2151bf2d0cacbf36
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>



More information about the asterisk-commits mailing list