[asterisk-commits] wdoekes: testsuite/asterisk/trunk r3818 - in /asterisk/trunk: ./ lib/python/a...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sat Jun 1 07:42:44 CDT 2013


Author: wdoekes
Date: Sat Jun  1 07:42:39 2013
New Revision: 3818

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=3818
Log:
Allow running the test suite without installing asterisk globally.

The new run-local script allows you to install asterisk in a temporary
directory and test it from there.

Example:
  $ cd asterisk-1.2.3
  $ make
  $ cd testsuite
  $ ./run-local setup
  $ ./run-local run -t tests/some/test

Patch by: Tzafrir Cohen, altered by me.

Review: https://reviewboard.asterisk.org/r/2433/
Review: https://reviewboard.asterisk.org/r/2371/

Added:
    asterisk/trunk/run-local   (with props)
Modified:
    asterisk/trunk/README.txt
    asterisk/trunk/lib/python/asterisk/asterisk.py
    asterisk/trunk/tests/apps/queues/macro_gosub_test/run-test
    asterisk/trunk/tests/apps/queues/position_priority_maxlen/run-test
    asterisk/trunk/tests/apps/queues/ringinuse_and_pause/run-test
    asterisk/trunk/tests/apps/queues/wrapup_time/run-test
    asterisk/trunk/tests/cdr/app_dial_G_flag/run-test
    asterisk/trunk/tests/cdr/app_queue/run-test
    asterisk/trunk/tests/cdr/blind-transfer-accountcode/run-test
    asterisk/trunk/tests/cdr/originate-cdr-disposition/run-test
    asterisk/trunk/tests/channels/SIP/handle_response_refer/run-test
    asterisk/trunk/tests/channels/SIP/rfc2833_dtmf_detect/run-test
    asterisk/trunk/tests/channels/SIP/sip_channel_params/run-test
    asterisk/trunk/tests/channels/SIP/tcpauthlimit/run-test
    asterisk/trunk/tests/channels/SIP/tcpauthtimeout/run-test
    asterisk/trunk/tests/fax/local_channel_t38_queryoption/run-test
    asterisk/trunk/tests/manager/action-events-response/run-test
    asterisk/trunk/tests/manager/authlimit/run-test
    asterisk/trunk/tests/manager/authtimeout/run-test
    asterisk/trunk/tests/manager/response-time/run-test

Modified: asterisk/trunk/README.txt
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/README.txt?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/README.txt (original)
+++ asterisk/trunk/README.txt Sat Jun  1 07:42:39 2013
@@ -201,6 +201,28 @@
 
 For more syntax information:
     $ ./runtests.py --help
+
+
+
+As an alternative to the above, you can use run-local:
+
+Get the Asterisk source tree you want to test:
+    $ svn co http://svn.digium.com/svn/asterisk/trunk asterisk-trunk
+    $ cd asterisk-trunk
+
+Optionally configure and make it:
+    $ ./configure && make
+
+Check out the test suite inside of the Asterisk source tree.  In this case, we
+will have the testsuite directory inside of the asterisk-trunk directory.
+    $ svn co http://svn.digium.com/svn/testsuite/asterisk/trunk testsuite
+    $ cd testsuite
+
+Setup the test environment:
+    $ ./run-local setup
+
+Run tests:
+    $ ./run-local run # Add here any of runtests.py's parameters.
 
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------

Modified: asterisk/trunk/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/lib/python/asterisk/asterisk.py?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/lib/python/asterisk/asterisk.py (original)
+++ asterisk/trunk/lib/python/asterisk/asterisk.py Sat Jun  1 07:42:39 2013
@@ -76,7 +76,7 @@
             self.__deferred.errback(self)
 
         self.__deferred = defer.Deferred()
-        df = utils.getProcessOutputAndValue(self.__cmd[0], self.__cmd)
+        df = utils.getProcessOutputAndValue(self.__cmd[0], self.__cmd, env=os.environ)
         df.addCallbacks(__cli_output_callback, __cli_error_callback)
 
         return self.__deferred
@@ -162,11 +162,35 @@
     asterisk.conf.
     """
 
-    """ The base location of the temporary files created by the testsuite """
-    test_suite_root = "/tmp/asterisk-testsuite"
-
-    """ The default etc directory for Asterisk """
-    asterisk_etc_directory = "/etc/asterisk"
+    """ If AST_TEST_ROOT is unset (the default):
+
+        BINARY = /usr/sbin/asterisk (or found in PATH)
+        SOURCE_ETC_DIR = /etc/asterisk
+        WORK_DIR = /tmp/asterisk-testsuite
+
+    If it is set:
+
+        BINARY = AST_TEST_ROOT/usr/sbin/asterisk
+        SOURCE_ETC_DIR = AST_TEST_ROOT/etc/asterisk
+        WORK_DIR = AST_TEST_ROOT/tmp
+
+    This allows you to run tests in a separate environment and without root
+    powers.
+
+    Note that AST_TEST_ROOT has to be reasonably short (symlinked in /tmp?) so
+    we're not running into the asterisk.ctl AF_UNIX limit.
+    """
+    localtest_root = os.getenv("AST_TEST_ROOT")
+    if localtest_root:
+        # Base location of the temporary files created by the testsuite
+        test_suite_root = os.path.join(localtest_root, "tmp")
+        # The default etc directory for Asterisk
+        default_etc_directory = os.path.join(localtest_root, "etc/asterisk")
+    else:
+        # Base location of the temporary files created by the testsuite
+        test_suite_root = "/tmp/asterisk-testsuite"
+        # The default etc directory for Asterisk
+        default_etc_directory = "/etc/asterisk"
 
     def __init__(self, base=None, ast_conf_options=None, host="127.0.0.1"):
         """Construct an Asterisk instance.
@@ -184,8 +208,10 @@
         self.base = Asterisk.test_suite_root
         if base is not None:
             self.base = "%s/%s" % (self.base, base)
-        self.astetcdir = Asterisk.asterisk_etc_directory
-        self.ast_binary = TestSuiteUtils.which("asterisk") or "/usr/sbin/asterisk"
+        if self.localtest_root:
+            self.ast_binary = self.localtest_root + "/usr/sbin/asterisk"
+        else:
+            self.ast_binary = TestSuiteUtils.which("asterisk") or "/usr/sbin/asterisk"
         self.host = host
 
         self.__ast_conf_options = ast_conf_options
@@ -195,7 +221,7 @@
 
         """ Find the system installed asterisk.conf """
         ast_confs = [
-            "/etc/asterisk/asterisk.conf",
+            os.path.join(self.default_etc_directory, "asterisk.conf"),
             "/usr/local/etc/asterisk/asterisk.conf",
         ]
         self.__ast_conf = None
@@ -238,7 +264,7 @@
             self.processProtocol = AsteriskProtocol(self.host, self.__stop_deferred)
             self.process = reactor.spawnProcess(self.processProtocol,
                                                 self.cmd[0],
-                                                self.cmd)
+                                                self.cmd, env=os.environ)
             # Begin the wait fully booted cycle
             self.__start_asterisk_time = time.time()
             reactor.callLater(0, __execute_wait_fully_booted)
@@ -700,19 +726,54 @@
             return
         cache.add(ast_dir_path)
 
-        for dirname, dirnames, filenames in os.walk(ast_dir_path):
+        # If we're running with a separate localroot, the paths in
+        # AST_TEST_ROOT/etc/asterisk/asterisk.conf are still short; e.g.
+        # /etc/asterisk. We suffix AST_TEST_ROOT here to get the real source
+        # dir.
+        if self.localtest_root:
+            ast_real_dir_path = self.localtest_root + ast_dir_path
+        else:
+            ast_real_dir_path = ast_dir_path
+
+        for dirname, dirnames, filenames in os.walk(ast_real_dir_path):
+            assert dirname[0] == "/"
+
             for filename in filenames:
-                target = "%s/%s" % (self.base, os.path.join(ast_dir_path,
-                                    dirname, filename))
+                # Shorten the dirname for inclusion into the new path.
+                short_dirname = dirname
+                if self.localtest_root:
+                    short_dirname = dirname[len(self.localtest_root):]
+
+                assert short_dirname[0] == "/"
+                target = "%s/%s/%s" % (self.base, short_dirname[1:], filename)
                 if os.path.lexists(target) or filename in blacklist:
                     continue
+
                 os.symlink(os.path.join(ast_dir_path, dirname, filename),
                            target)
 
     def __makedirs(self, ast_dir_path):
+        # If we're running with a separate localroot, the paths in
+        # AST_TEST_ROOT/etc/asterisk/asterisk.conf are still short; e.g.
+        # /etc/asterisk. We suffix AST_TEST_ROOT here to get the real source
+        # dir.
+        if self.localtest_root:
+            ast_real_dir_path = self.localtest_root + ast_dir_path
+        else:
+            ast_real_dir_path = ast_dir_path
+
         target_dir = "%s%s" % (self.base, ast_dir_path)
         if not os.path.exists(target_dir):
             os.makedirs(target_dir)
-        for dirname, dirnames, filenames in os.walk(ast_dir_path):
+
+        for dirname, dirnames, filenames in os.walk(ast_real_dir_path):
+            # Shorten the dirname for inclusion into the new path.
+            short_dirname = dirname
+            if self.localtest_root:
+                short_dirname = dirname[len(self.localtest_root):]
+
             for d in dirnames:
-                self.__makedirs(os.path.join(target_dir, dirname, d))
+                self.__makedirs(os.path.join(target_dir, short_dirname, d))
+
+
+# vim: set ts=8 sw=4 sts=4 et ai tw=79:

Added: asterisk/trunk/run-local
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/run-local?view=auto&rev=3818
==============================================================================
--- asterisk/trunk/run-local (added)
+++ asterisk/trunk/run-local Sat Jun  1 07:42:39 2013
@@ -1,0 +1,73 @@
+#!/bin/sh
+
+# run_local: run the test suite without changing the system
+
+set -e
+HERE="`(cd "\`dirname "$0"\`" >/dev/null; pwd; cd - >/dev/null)`"
+cd "$HERE"
+
+usage() {
+	echo >&2 "$0: Run the test suite locally:"
+	echo >&2 "$0 setup         # Initial setup"
+	echo >&2 "$0 run <params>  # A wrapper for ./runtests.py"
+}
+
+setup() {
+	(
+		cd asttest
+		make
+		make install DESTDIR="$HERE/root"
+	)
+	(
+		cd ..
+		# The user may have already run ./configure and make
+		if [ ! -f config.status ]; then
+			./configure
+		fi
+		make
+		make install samples DESTDIR="$HERE/astroot"
+	)
+}
+
+mktemp_symlink() {
+	template="$1"
+	target="$2"
+	for i in `seq 8`; do
+		link_name=`mktemp -u "$template"`
+		if ln -s "$HERE/astroot" "$link_name"; then
+			echo "$link_name"
+			return 0
+		fi
+	done
+
+	# We should get here. Normally symlinking should work at first shot.
+	# If it fails even once, it's pretty bad luck. Twice or more: a bug?
+	echo >&2 "$0: Failed generating temporary link. Aborting"
+	return 1
+}
+
+run() {
+	# Explicitly under /tmp as it has to be a short enough path:
+	# a unix socket name (asterisk.ctl) has to be no longer than
+	# UNIX_PATH_MAX (108) characters:
+	export AST_TEST_ROOT=`mktemp_symlink /tmp/ast_test_XXXXXX $HERE/astroot`
+	export PATH="$HERE/asttest/root/usr/local/bin:$HERE/astroot/usr/sbin:$PATH"
+        # Preprend ':' if LD_LIBRARY_PATH is not empty:
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
+	export LD_LIBRARY_PATH="$HERE/astroot/usr/lib${LD_LIBRARY_PATH}"
+	set +e
+	./runtests.py "$@"
+	status=$?
+	rm "$AST_TEST_ROOT"
+	set -e
+	return $status
+}
+
+cmd="$1"
+
+case "$cmd" in
+setup | run)
+	shift
+	"$cmd" "$@";;
+*) usage; exit 1;;
+esac

Propchange: asterisk/trunk/run-local
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: asterisk/trunk/run-local
------------------------------------------------------------------------------
    svn:executable = *

Propchange: asterisk/trunk/run-local
------------------------------------------------------------------------------
    svn:keywords = wdoekes 2013-06-01 1 1

Propchange: asterisk/trunk/run-local
------------------------------------------------------------------------------
    svn:mime-type = text/x-shellscript

Modified: asterisk/trunk/tests/apps/queues/macro_gosub_test/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/queues/macro_gosub_test/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/apps/queues/macro_gosub_test/run-test (original)
+++ asterisk/trunk/tests/apps/queues/macro_gosub_test/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 
-asttest -a / -s tests/queues/macro_gosub_test
+asttest -a /$AST_TEST_ROOT -s tests/queues/macro_gosub_test

Modified: asterisk/trunk/tests/apps/queues/position_priority_maxlen/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/queues/position_priority_maxlen/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/apps/queues/position_priority_maxlen/run-test (original)
+++ asterisk/trunk/tests/apps/queues/position_priority_maxlen/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 
-asttest -a / -s tests/apps/queues/position_priority_maxlen
+asttest -a /$AST_TEST_ROOT -s tests/apps/queues/position_priority_maxlen

Modified: asterisk/trunk/tests/apps/queues/ringinuse_and_pause/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/queues/ringinuse_and_pause/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/apps/queues/ringinuse_and_pause/run-test (original)
+++ asterisk/trunk/tests/apps/queues/ringinuse_and_pause/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 
-asttest -a / -s tests/queues/ringinuse_and_pause
+asttest -a /$AST_TEST_ROOT -s tests/queues/ringinuse_and_pause

Modified: asterisk/trunk/tests/apps/queues/wrapup_time/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/apps/queues/wrapup_time/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/apps/queues/wrapup_time/run-test (original)
+++ asterisk/trunk/tests/apps/queues/wrapup_time/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 
-asttest -a / -s tests/queues/wrapup_time
+asttest -a /$AST_TEST_ROOT -s tests/queues/wrapup_time

Modified: asterisk/trunk/tests/cdr/app_dial_G_flag/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_dial_G_flag/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/cdr/app_dial_G_flag/run-test (original)
+++ asterisk/trunk/tests/cdr/app_dial_G_flag/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/cdr/app_queue/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/app_queue/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/cdr/app_queue/run-test (original)
+++ asterisk/trunk/tests/cdr/app_queue/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/cdr/blind-transfer-accountcode/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/blind-transfer-accountcode/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/cdr/blind-transfer-accountcode/run-test (original)
+++ asterisk/trunk/tests/cdr/blind-transfer-accountcode/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/cdr/originate-cdr-disposition/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/cdr/originate-cdr-disposition/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/cdr/originate-cdr-disposition/run-test (original)
+++ asterisk/trunk/tests/cdr/originate-cdr-disposition/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/channels/SIP/handle_response_refer/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/handle_response_refer/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/channels/SIP/handle_response_refer/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/handle_response_refer/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/channels/SIP/rfc2833_dtmf_detect/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/rfc2833_dtmf_detect/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/channels/SIP/rfc2833_dtmf_detect/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/rfc2833_dtmf_detect/run-test Sat Jun  1 07:42:39 2013
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 set -e
 
-asttest -a / -s tests/channels/SIP/rfc2833_dtmf_detect
+asttest -a /$AST_TEST_ROOT -s tests/channels/SIP/rfc2833_dtmf_detect
 

Modified: asterisk/trunk/tests/channels/SIP/sip_channel_params/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/sip_channel_params/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/channels/SIP/sip_channel_params/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/sip_channel_params/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/channels/SIP/tcpauthlimit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/tcpauthlimit/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/channels/SIP/tcpauthlimit/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/tcpauthlimit/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/channels/SIP/tcpauthtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/channels/SIP/tcpauthtimeout/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/channels/SIP/tcpauthtimeout/run-test (original)
+++ asterisk/trunk/tests/channels/SIP/tcpauthtimeout/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/fax/local_channel_t38_queryoption/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/fax/local_channel_t38_queryoption/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/fax/local_channel_t38_queryoption/run-test (original)
+++ asterisk/trunk/tests/fax/local_channel_t38_queryoption/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/manager/action-events-response/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/action-events-response/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/manager/action-events-response/run-test (original)
+++ asterisk/trunk/tests/manager/action-events-response/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/manager/authlimit/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/authlimit/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/manager/authlimit/run-test (original)
+++ asterisk/trunk/tests/manager/authlimit/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/manager/authtimeout/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/authtimeout/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/manager/authtimeout/run-test (original)
+++ asterisk/trunk/tests/manager/authtimeout/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@

Modified: asterisk/trunk/tests/manager/response-time/run-test
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/manager/response-time/run-test?view=diff&rev=3818&r1=3817&r2=3818
==============================================================================
--- asterisk/trunk/tests/manager/response-time/run-test (original)
+++ asterisk/trunk/tests/manager/response-time/run-test Sat Jun  1 07:42:39 2013
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -e
 . lib/sh/lua.sh
-asttest -a / -s `dirname $0` $@
+asttest -a /$AST_TEST_ROOT -s `dirname $0` $@




More information about the asterisk-commits mailing list