[cig-commits] r13536 - cs/cigma/trunk/tests/system

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:13:36 -0800 (Tue, 09 Dec 2008)
New Revision: 13536

Modified:
   cs/cigma/trunk/tests/system/100-extract.sh
   cs/cigma/trunk/tests/system/150-extract.py
   cs/cigma/trunk/tests/system/200-eval.sh
   cs/cigma/trunk/tests/system/250-eval.py
   cs/cigma/trunk/tests/system/300-compare.sh
   cs/cigma/trunk/tests/system/301-compare.sh
   cs/cigma/trunk/tests/system/350-compare.py
Log:
Changed prefix to datadir for system tests

Modified: cs/cigma/trunk/tests/system/100-extract.sh
===================================================================
--- cs/cigma/trunk/tests/system/100-extract.sh	2008-12-10 02:13:33 UTC (rev 13535)
+++ cs/cigma/trunk/tests/system/100-extract.sh	2008-12-10 02:13:36 UTC (rev 13536)
@@ -1,7 +1,11 @@
 #!/bin/bash
 
-D=$HOME/cigma/tests/data
+D=$HOME/cigma/tests
+
 ./cigma extract \
+    --rule=tet4 \
+    --mesh=$D/data/brick2/brick2.h5:/ \
+    --output=$D/system/out/quux.h5
     \
     $*
 

Modified: cs/cigma/trunk/tests/system/150-extract.py
===================================================================
--- cs/cigma/trunk/tests/system/150-extract.py	2008-12-10 02:13:33 UTC (rev 13535)
+++ cs/cigma/trunk/tests/system/150-extract.py	2008-12-10 02:13:36 UTC (rev 13536)
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 import cigma
-D = '/home/luis/cigma/tests/data'
+D = '/home/luis/cigma/tests'
 
-mesh = cigma.open_mesh('%s/brick1/brick1.h5', '/')
+mesh = cigma.open_mesh('%s/data/brick1/brick1.h5', '/')
 points = cigma.extract_points(mesh)
 

Modified: cs/cigma/trunk/tests/system/200-eval.sh
===================================================================
--- cs/cigma/trunk/tests/system/200-eval.sh	2008-12-10 02:13:33 UTC (rev 13535)
+++ cs/cigma/trunk/tests/system/200-eval.sh	2008-12-10 02:13:36 UTC (rev 13536)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-D=$HOME/cigma/tests/data
+D=$HOME/cigma/tests
 
 ./cigma eval \
     \

Modified: cs/cigma/trunk/tests/system/250-eval.py
===================================================================
--- cs/cigma/trunk/tests/system/250-eval.py	2008-12-10 02:13:33 UTC (rev 13535)
+++ cs/cigma/trunk/tests/system/250-eval.py	2008-12-10 02:13:36 UTC (rev 13536)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import cigma
-D = '/home/luis/cigma/tests/data'
+D = '/home/luis/cigma/tests'
 
 fn = cigma.new_function('test.cube')
 points = cigma.open_points('points.dat')

Modified: cs/cigma/trunk/tests/system/300-compare.sh
===================================================================
--- cs/cigma/trunk/tests/system/300-compare.sh	2008-12-10 02:13:33 UTC (rev 13535)
+++ cs/cigma/trunk/tests/system/300-compare.sh	2008-12-10 02:13:36 UTC (rev 13536)
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-D=$HOME/cigma/tests/data
-A=$D/brick1
-B=$D/brick2
+D=$HOME/cigma/tests
+A=$D/data/brick1
+B=$D/data/brick2
 
 ./cigma compare \
     \

Modified: cs/cigma/trunk/tests/system/301-compare.sh
===================================================================
--- cs/cigma/trunk/tests/system/301-compare.sh	2008-12-10 02:13:33 UTC (rev 13535)
+++ cs/cigma/trunk/tests/system/301-compare.sh	2008-12-10 02:13:36 UTC (rev 13536)
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-D=$HOME/cigma/tests/data
-A=$D/brick1
-B=$D/brick2
+D=$HOME/cigma/tests
+A=$D/data/brick1
+B=$D/data/brick2
 
 ./cigma compare \
     \

Modified: cs/cigma/trunk/tests/system/350-compare.py
===================================================================
--- cs/cigma/trunk/tests/system/350-compare.py	2008-12-10 02:13:33 UTC (rev 13535)
+++ cs/cigma/trunk/tests/system/350-compare.py	2008-12-10 02:13:36 UTC (rev 13536)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import cigma
-D = '/home/luis/cigma/tests/data'
+D = '/home/luis/cigma/tests'
 
 a = cigma.open_field('a')
 b = cigma.open_field('b')