[svn-commits] mmichelson: branch mmichelson/v6tests r536 - in /asterisk/team/mmichelson/v6t...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 21 15:09:27 2010
New Revision: 536

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=536
Log:
Resolve conflict and reset automerge.


Modified:
    asterisk/team/mmichelson/v6tests/   (props changed)
    asterisk/team/mmichelson/v6tests/README.txt
    asterisk/team/mmichelson/v6tests/asttest/Makefile
    asterisk/team/mmichelson/v6tests/lib/python/asterisk/asterisk.py
    asterisk/team/mmichelson/v6tests/runtests.py

Propchange: asterisk/team/mmichelson/v6tests/
------------------------------------------------------------------------------
    automerge = *

Propchange: asterisk/team/mmichelson/v6tests/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 21 15:09:27 2010
@@ -1,1 +1,1 @@
-/asterisk/trunk:1-529
+/asterisk/trunk:1-535

Modified: asterisk/team/mmichelson/v6tests/README.txt
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/v6tests/README.txt?view=diff&rev=536&r1=535&r2=536
==============================================================================
--- asterisk/team/mmichelson/v6tests/README.txt (original)
+++ asterisk/team/mmichelson/v6tests/README.txt Wed Jul 21 15:09:27 2010
@@ -271,6 +271,7 @@
         # runtests.py.  For example, if the dependency is 'ipv6', then the
         # depend_ipv6() method is called to determine if the dependency is met.
         - custom : 'ipv6'
+        - custom : 'fax'
 
 
 

Modified: asterisk/team/mmichelson/v6tests/asttest/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/v6tests/asttest/Makefile?view=diff&rev=536&r1=535&r2=536
==============================================================================
--- asterisk/team/mmichelson/v6tests/asttest/Makefile (original)
+++ asterisk/team/mmichelson/v6tests/asttest/Makefile Wed Jul 21 15:09:27 2010
@@ -46,7 +46,7 @@
 
 # Basic set of sources and flags/libraries/includes
 OBJS:=asttest.o lib/lua.o lib/testsuite.o lib/testutils.o
-CFLAGS:=-g -c -D_GNU_SOURCE -Wall `pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null` -Iinclude
+CFLAGS:=-g -D_GNU_SOURCE -Wall `pkg-config --cflags lua5.1 2> /dev/null || pkg-config --cflags lua 2> /dev/null` -Iinclude
 L_MODULES:=$(LUAFILESYSTEM_OBJS) $(LUASOCKET_OBJS) $(LUAPOSIX_OBJS) 
 L_LIBS:=$(LUAPOSIX_LIBS)
 L_OBJS:=lib/lua/testlib.o lib/lua/astlib.o lib/lua/proclib.o
@@ -105,7 +105,7 @@
 lib/testutils.o: lib/testutils.c include/asttest/testutils.h include/asttest/asttest.h include/asttest/testsuite.h include/asttest/lua.h
 
 lib/lua.o: lib/lua.c $(L_MODULES) include/asttest/lua.h include/asttest/testsuite.h include/asttest/lua/*.h
-	$(CC) $(CFLAGS) -o $@ \
+	$(CC) $(CFLAGS) -c -o $@ \
 	-DLUAFILESYSTEM_HEADER=\"../$(LUAFILESYSTEM_HEADER)\" \
 	-DLUASOCKET_HEADER=\"../$(LUASOCKET_HEADER)\" \
 	-DLUAPOSIX_HEADER=\"../$(LUAPOSIX_HEADER)\" \

Modified: asterisk/team/mmichelson/v6tests/lib/python/asterisk/asterisk.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/v6tests/lib/python/asterisk/asterisk.py?view=diff&rev=536&r1=535&r2=536
==============================================================================
--- asterisk/team/mmichelson/v6tests/lib/python/asterisk/asterisk.py (original)
+++ asterisk/team/mmichelson/v6tests/lib/python/asterisk/asterisk.py Wed Jul 21 15:09:27 2010
@@ -51,6 +51,7 @@
         self.asterisk = Asterisk(base=os.path.join(os.getcwd(),
                                                    "tests/ami-login/tmp"))
         """
+        self.directories = {}
         self.ast_version = AsteriskVersion()
 
         self.astetcdir = "/etc/asterisk"
@@ -198,6 +199,7 @@
             f.write("[%s]\n\n" % c.name)
             if c.name == "directories":
                 for (var, val) in c.options:
+                    self.directories[var] = val
                     f.write("%s = %s%s\n" % (var, self.base, val))
             else:
                 for (var, val) in c.options:

Modified: asterisk/team/mmichelson/v6tests/runtests.py
URL: http://svnview.digium.com/svn/testsuite/asterisk/team/mmichelson/v6tests/runtests.py?view=diff&rev=536&r1=535&r2=536
==============================================================================
--- asterisk/team/mmichelson/v6tests/runtests.py (original)
+++ asterisk/team/mmichelson/v6tests/runtests.py Wed Jul 21 15:09:27 2010
@@ -19,6 +19,7 @@
 sys.path.append("lib/python")
 
 from asterisk.version import AsteriskVersion
+from asterisk.asterisk import Asterisk
 
 
 TESTS_CONFIG = "tests/tests.yaml"
@@ -102,6 +103,22 @@
             return False
         return True
 
+    def depend_fax(self):
+        fax_providers = [
+            "app_fax.so",
+            "res_fax_spandsp.so",
+            "res_fax_digium.so",
+        ]
+        ast = Asterisk(base="/tmp/asterisk-testsuite/runtests")
+
+        if "astmoddir" not in ast.directories:
+            return False
+        for f in fax_providers:
+            if os.path.exists("%s/%s" % (ast.directories["astmoddir"], f)):
+                return True
+
+        return False
+
 class TestConfig:
     def __init__(self, test_name, ast_version):
         self.can_run = True