yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3044
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Mon 2012-03-12 20:13:12 +0100
message:
  Fix --check tests after moving testing scripts.
modified:
  SConstruct
  core/main/main.py.in


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2012-01-30 21:13:08 +0000
+++ SConstruct	2012-03-12 19:13:12 +0000
@@ -606,9 +606,9 @@
 #################################################################################
 #### Check Tests
 env.Install('$LIBDIR/py/yade/tests/checks',[
-	env.File(env.Glob('scripts/test/checks/*.*'))
+	env.File(env.Glob('examples/test/checks/*.*'))
 ])
 
 env.Install('$LIBDIR/py/yade/tests/checks/data',[
-	env.File(env.Glob('scripts/test/checks/data/*'))
+	env.File(env.Glob('examples/test/checks/data/*'))
 ])

=== modified file 'core/main/main.py.in'
--- core/main/main.py.in	2012-02-02 20:44:51 +0000
+++ core/main/main.py.in	2012-03-12 19:13:12 +0000
@@ -34,7 +34,7 @@
 par.add_option('--rebuild',help="Re-run build in the source directory, then run the updated yade with the same command line except \-\-rebuild. The build profile for this build (${profile}) and its stored parameters will be used.",dest='rebuild',action='store_true')
 par.add_option('--test',help="Run regression test suite and exit; the exists status is 0 if all tests pass, 1 if a test fails and 2 for an unspecified exception.",dest="test",action='store_true')
 par.add_option('--debug',help='Run the debug build, if available.',dest='debug',action='store_true')
-par.add_option('--checks',help='Run a series of user-defined check tests as described in ${sourceRoot}/scripts/test/checks/README',dest='checks',action='store_true')
+par.add_option('--checks',help='Run a series of user-defined check tests as described in ${sourceRoot}/examples/test/checks/README',dest='checks',action='store_true')
 par.add_option('--performance',help='Starts a test to measure the productivity',dest='performance',action='store_true')
 par.add_option('--no-gdb',help='Do not show backtrace when yade crashes (only effective with \-\-debug).',dest='noGdb',action='store_true',)
 par.disable_interspersed_args()
@@ -150,14 +150,14 @@
 from yade import pack
 from pack import *
 
-# Run the check tests listed in scripts/test/checks/checkList.py
+# Run the check tests listed in examples/test/checks/checkList.py
 if opts.checks:
 	checksPath=libDir+'/py/yade/tests/checks'
 	execfile(checksPath+'/checkList.py')
 
 # Run performance check test
 if opts.performance:
-	checksPath='${sourceRoot}'+'/scripts/test/performance'
+	checksPath='${sourceRoot}'+'/examples/test/performance'
 	execfile(checksPath+'/checkPerf.py')
 
 def userSession(qt4=False,qapp=None):