[Csp-commits] svn:csp r2161 - trunk/csp/tools

[<sv...@ww...>]

Author: mkrose
Date: 2007-07-30 23:42:27 -0700 (Mon, 30 Jul 2007)
New Revision: 2161

Modified:
   trunk/csp/tools/runtests.py
Log:
Simplify runtests.py tool and add a usage message to indicate
that scons should be used instead to build and run tests.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2161

Modified: trunk/csp/tools/runtests.py
===================================================================
--- trunk/csp/tools/runtests.py	2007-07-31 06:09:18 UTC (rev 2160)
+++ trunk/csp/tools/runtests.py	2007-07-31 06:42:27 UTC (rev 2161)
@@ -23,10 +23,6 @@
 import os
 import sys
 
-MODULES = [
-	'csplib/.bin/csplib_tests',
-]
-
 try:
 	import csp
 	os.environ.setdefault('CSPLOG_FILE', os.path.join(csp.dir, '.testlog'))
@@ -36,17 +32,7 @@
 	print 'bootstrap module has been installed.  See README for details.'
 	sys.exit(0)
 
-
 def LoadOneModule(path):
-	# this code is not very portable (e.g., .sl on hpux); prefer 'scons runtests'
-	if sys.platform.startswith('win'):
-		pre = ''
-		ext = '.dll'
-	else:
-		pre = 'lib'
-		ext = '.so'
-	lib = pre + os.path.basename(path) + ext
-	path = os.path.join(csp.dir, os.path.dirname(path), lib)
 	if not csp.csplib.TestRegistry.loadTestModule(path):
 		print 'Unable to load test module "%s".  Check that it has been built.' % path
 		sys.exit(0)
@@ -55,15 +41,15 @@
 	for module in modules:
 		LoadOneModule(module)
 
-def runall():
-	LoadModules(MODULES)
-	csp.csplib.TestRegistry.runAll()
-
 if __name__ == '__main__':
-	LoadModules(MODULES)
 	if len(sys.argv) > 1:
-		for path in sys.argv[1:]:
-			csp.csplib.TestRegistry.runOnePath(path)
-	else:
+		LoadModules(sys.argv[1:])
 		csp.csplib.TestRegistry.runAll()
+	else:
+		print 'A simple utility to run CSP test modules manually.'
+		print
+		print 'Note that scons is generally a better tool for running tests (e.g.,'
+		print 'use "scons runtests" to build and run all tests).'
+		print
+		print 'Usage: %s test_module [test_module ...]' % sys.argv[0]