[asterisk-commits] mnicholson: testsuite/asterisk/trunk r140 - in /asterisk/trunk: asttest/ astt...

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Mar 25 10:54:28 2010
New Revision: 140

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=140
Log:
Moved the asttest.lua lib to the lib/lua directory and modified the asttest Makefile and self-tests accordingly

Added:
    asterisk/trunk/lib/lua/asttest.lua
      - copied unchanged from r138, asterisk/trunk/asttest/self-tests/asttest.lua
Removed:
    asterisk/trunk/asttest/self-tests/asttest.lua
Modified:
    asterisk/trunk/asttest/Makefile
    asterisk/trunk/asttest/self-tests/test_error/test.lua
    asterisk/trunk/asttest/self-tests/test_fail/test.lua
    asterisk/trunk/asttest/self-tests/test_pass/test.lua
    asterisk/trunk/asttest/self-tests/test_skip/test.lua
    asterisk/trunk/asttest/self-tests/test_testlib/test.lua
    asterisk/trunk/asttest/self-tests/test_xfail/test.lua
    asterisk/trunk/asttest/self-tests/test_xpass/test.lua

Modified: asterisk/trunk/asttest/Makefile
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/Makefile?view=diff&rev=140&r1=139&r2=140
==============================================================================
--- asterisk/trunk/asttest/Makefile (original)
+++ asterisk/trunk/asttest/Makefile Thu Mar 25 10:54:28 2010
@@ -152,8 +152,10 @@
 
 check: test
 tests: test
-test: asttest asterisk
-	./asttest tests
+test: asttest
+	LUA_PATH=$(PWD)/../lib/lua/?.lua\;\; \
+	LUA_CPATH=$(PWD)/../lib/lua/\?.so\;\; \
+	./asttest self-tests
 
 clean:
 	rm -f asttest $(OBJS) $(M_OBJS) $(C_OBJS) $(G_OBJS) $(N_OBJS) $(L_OBJS)

Modified: asterisk/trunk/asttest/self-tests/test_error/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/self-tests/test_error/test.lua?view=diff&rev=140&r1=139&r2=140
==============================================================================
--- asterisk/trunk/asttest/self-tests/test_error/test.lua (original)
+++ asterisk/trunk/asttest/self-tests/test_error/test.lua Thu Mar 25 10:54:28 2010
@@ -1,6 +1,5 @@
 -- spawn the test driver to test errors with various causes
 
-package.path = package.path .. ";../?.lua"
 require "asttest"
 
 a = asttest.run("tests")

Modified: asterisk/trunk/asttest/self-tests/test_fail/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/self-tests/test_fail/test.lua?view=diff&rev=140&r1=139&r2=140
==============================================================================
--- asterisk/trunk/asttest/self-tests/test_fail/test.lua (original)
+++ asterisk/trunk/asttest/self-tests/test_fail/test.lua Thu Mar 25 10:54:28 2010
@@ -1,6 +1,5 @@
 -- spawn the test driver to test failure
 
-package.path = package.path .. ";../?.lua"
 require "asttest"
 
 a = asttest.run("tests")

Modified: asterisk/trunk/asttest/self-tests/test_pass/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/self-tests/test_pass/test.lua?view=diff&rev=140&r1=139&r2=140
==============================================================================
--- asterisk/trunk/asttest/self-tests/test_pass/test.lua (original)
+++ asterisk/trunk/asttest/self-tests/test_pass/test.lua Thu Mar 25 10:54:28 2010
@@ -1,6 +1,5 @@
 -- spawn the test driver to test passing
 
-package.path = package.path .. ";../?.lua"
 require "asttest"
 
 a = asttest.run("tests")

Modified: asterisk/trunk/asttest/self-tests/test_skip/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/self-tests/test_skip/test.lua?view=diff&rev=140&r1=139&r2=140
==============================================================================
--- asterisk/trunk/asttest/self-tests/test_skip/test.lua (original)
+++ asterisk/trunk/asttest/self-tests/test_skip/test.lua Thu Mar 25 10:54:28 2010
@@ -1,6 +1,5 @@
 -- spawn the test driver to test skip functionality
 
-package.path = package.path .. ";../?.lua"
 require "asttest"
 
 a = asttest.run("tests")

Modified: asterisk/trunk/asttest/self-tests/test_testlib/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/self-tests/test_testlib/test.lua?view=diff&rev=140&r1=139&r2=140
==============================================================================
--- asterisk/trunk/asttest/self-tests/test_testlib/test.lua (original)
+++ asterisk/trunk/asttest/self-tests/test_testlib/test.lua Thu Mar 25 10:54:28 2010
@@ -1,7 +1,6 @@
 -- test the test library
 -- note: ts_log() and print() are not tested
 
-package.path = package.path .. ";../?.lua"
 require "asttest"
 
 a = asttest.run("tests")

Modified: asterisk/trunk/asttest/self-tests/test_xfail/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/self-tests/test_xfail/test.lua?view=diff&rev=140&r1=139&r2=140
==============================================================================
--- asterisk/trunk/asttest/self-tests/test_xfail/test.lua (original)
+++ asterisk/trunk/asttest/self-tests/test_xfail/test.lua Thu Mar 25 10:54:28 2010
@@ -1,6 +1,5 @@
 -- spawn the test driver to test expected failures
 
-package.path = package.path .. ";../?.lua"
 require "asttest"
 
 a = asttest.run("tests")

Modified: asterisk/trunk/asttest/self-tests/test_xpass/test.lua
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/asttest/self-tests/test_xpass/test.lua?view=diff&rev=140&r1=139&r2=140
==============================================================================
--- asterisk/trunk/asttest/self-tests/test_xpass/test.lua (original)
+++ asterisk/trunk/asttest/self-tests/test_xpass/test.lua Thu Mar 25 10:54:28 2010
@@ -1,6 +1,5 @@
 -- spawn the test driver to test unexpected successes
 
-package.path = package.path .. ";../?.lua"
 require "asttest"
 
 a = asttest.run("tests")