yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2834
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Tue 2011-04-26 18:02:57 +0200
message:
  1. --check tests are now copying into the libDir/py/yade/tests/checks folder to make it available in packaged yade version.
  2. Rename "dataTriax" folder to "data" to make this folder and for other tests suitable.
renamed:
  scripts/test/checks/dataTriax/ => scripts/test/checks/data/
modified:
  SConstruct
  core/main/main.py.in
  scripts/test/checks/checkTestTriax.py


--
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	2011-04-04 08:25:36 +0000
+++ SConstruct	2011-04-26 16:02:57 +0000
@@ -598,3 +598,13 @@
 		env.Default(c)
 
 #Progress('.', interval=100, file=sys.stderr)
+
+#################################################################################
+#### Check Tests
+env.Install('$LIBDIR/py/yade/tests/checks',[
+	env.File(env.Glob('scripts/test/checks/*.*'))
+])
+
+env.Install('$LIBDIR/py/yade/tests/checks/data',[
+	env.File(env.Glob('scripts/test/checks/data/*'))
+])

=== modified file 'core/main/main.py.in'
--- core/main/main.py.in	2011-03-16 16:09:44 +0000
+++ core/main/main.py.in	2011-04-26 16:02:57 +0000
@@ -149,7 +149,7 @@
 
 # Run the check tests listed in scripts/test/checks/checkList.py
 if opts.checks:
-	checksPath='${sourceRoot}'+'/scripts/test/checks' # replaced at install-time
+	checksPath=libDir+'/py/yade/tests/checks'
 	execfile(checksPath+'/checkList.py')
 
 # Run performance check test

=== modified file 'scripts/test/checks/checkTestTriax.py'
--- scripts/test/checks/checkTestTriax.py	2011-04-22 09:49:03 +0000
+++ scripts/test/checks/checkTestTriax.py	2011-04-26 16:02:57 +0000
@@ -3,7 +3,7 @@
 # Check the result of a triaxial test on a dense 100 spheres packing with position defined,
 # comparing stresses at the "peak" state. The initial positions have been generated by
 # internal compaction without friction, so that it is initially at equilibrium without shear forces. 
-# Positions and reference results are in dataTriax folder.
+# Positions and reference results are in data folder.
 from yade import pack,log,utils,export,plot
 import math,os,sys
 log.setLevel('TriaxialCompressionEngine',log.ERROR)
@@ -11,7 +11,7 @@
 tolerance=0.01
 interactive=False
 errors=0
-tt=TriaxialTest(internalCompaction=True,numberOfGrains=100,compactionFrictionDeg=0,sphereFrictionDeg=30,importFilename=checksPath+'/dataTriax/checkTestTriax.spheres')
+tt=TriaxialTest(internalCompaction=True,numberOfGrains=100,compactionFrictionDeg=0,sphereFrictionDeg=30,importFilename=checksPath+'/data/checkTestTriax.spheres')
 tt.generate("checkTest.yade")
 O.load("checkTest.yade")
 O.run(2020,True)

=== renamed directory 'scripts/test/checks/dataTriax' => 'scripts/test/checks/data'