[cig-commits] [commit] baagaard/add-release-2.0.3, baagaard/add-release-2.1.0, baagaard/dynrup-new-lagrange, baagaard/feature-output-station-names, baagaard/feature-progress-monitor, baagaard/fix-custom-faultpc, baagaard/fix-faults-intersect, baagaard/update-autoconf, knepley/feature-petsc-fe, knepley/upgrade-petsc-3.5, knepley/upgrade-petsc-master, maint, master, next, willic3/fix-plasticity: Update pytest files for automake 1.13. (a53c18e)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 15:45:12 PST 2014 

Repository : https://github.com/geodynamics/pylith

On branches: baagaard/add-release-2.0.3,baagaard/add-release-2.1.0,baagaard/dynrup-new-lagrange,baagaard/feature-output-station-names,baagaard/feature-progress-monitor,baagaard/fix-custom-faultpc,baagaard/fix-faults-intersect,baagaard/update-autoconf,knepley/feature-petsc-fe,knepley/upgrade-petsc-3.5,knepley/upgrade-petsc-master,maint,master,next,willic3/fix-plasticity
Link       : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a

>---------------------------------------------------------------

commit a53c18eeef8a8a0aaf4eb40b3d7afdaab14714cc
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Mon Aug 18 15:13:43 2014 -0700

    Update pytest files for automake 1.13.
    
    Remove use of TESTS_ENVIRONMENT = $PYTHON for pytests. Not compatible
    with automake 1.13.


>---------------------------------------------------------------

a53c18eeef8a8a0aaf4eb40b3d7afdaab14714cc
 unittests/pytests/bc/Makefile.am               | 2 --
 unittests/pytests/bc/testbc.py                 | 2 +-
 unittests/pytests/faults/Makefile.am           | 2 --
 unittests/pytests/faults/testfaults.py         | 2 +-
 unittests/pytests/feassemble/Makefile.am       | 2 --
 unittests/pytests/feassemble/testfeassemble.py | 2 +-
 unittests/pytests/friction/Makefile.am         | 2 --
 unittests/pytests/friction/testfriction.py     | 2 +-
 unittests/pytests/materials/Makefile.am        | 2 --
 unittests/pytests/materials/testmaterials.py   | 2 +-
 unittests/pytests/meshio/Makefile.am           | 2 --
 unittests/pytests/meshio/testcubit.py          | 2 +-
 unittests/pytests/meshio/testhdf5.py           | 2 +-
 unittests/pytests/meshio/testmeshio.py         | 2 +-
 unittests/pytests/mpi/Makefile.am              | 2 --
 unittests/pytests/mpi/testmpi.py               | 2 +-
 unittests/pytests/problems/Makefile.am         | 2 --
 unittests/pytests/problems/testproblems.py     | 2 +-
 unittests/pytests/topology/Makefile.am         | 9 ---------
 unittests/pytests/topology/testtopology.py     | 2 +-
 unittests/pytests/utils/Makefile.am            | 2 --
 unittests/pytests/utils/testmanager.py         | 2 +-
 unittests/pytests/utils/testutils.py           | 2 +-
 23 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/unittests/pytests/bc/Makefile.am b/unittests/pytests/bc/Makefile.am
index 22a0af1..cfc13d0 100644
--- a/unittests/pytests/bc/Makefile.am
+++ b/unittests/pytests/bc/Makefile.am
@@ -24,8 +24,6 @@ SUBDIRS = data
 TESTS = testbc.py
 dist_check_SCRIPTS = testbc.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestAbsorbingDampers.py \
 	TestDirichletBC.py \
diff --git a/unittests/pytests/bc/testbc.py b/unittests/pytests/bc/testbc.py
old mode 100644
new mode 100755
index e56ace8..e3e27d2
--- a/unittests/pytests/bc/testbc.py
+++ b/unittests/pytests/bc/testbc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/faults/Makefile.am b/unittests/pytests/faults/Makefile.am
index 67e3676..c57a3c1 100644
--- a/unittests/pytests/faults/Makefile.am
+++ b/unittests/pytests/faults/Makefile.am
@@ -24,8 +24,6 @@ SUBDIRS = data
 TESTS = testfaults.py
 dist_check_SCRIPTS = testfaults.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestBruneSlipFn.py \
 	TestConstRateSlipFn.py \
diff --git a/unittests/pytests/faults/testfaults.py b/unittests/pytests/faults/testfaults.py
old mode 100644
new mode 100755
index 4add3b6..2c31ae1
--- a/unittests/pytests/faults/testfaults.py
+++ b/unittests/pytests/faults/testfaults.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/feassemble/Makefile.am b/unittests/pytests/feassemble/Makefile.am
index 5e18ec6..f28de0d 100644
--- a/unittests/pytests/feassemble/Makefile.am
+++ b/unittests/pytests/feassemble/Makefile.am
@@ -24,8 +24,6 @@ SUBDIRS = data
 TESTS = testfeassemble.py
 dist_check_SCRIPTS = testfeassemble.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestFIATLagrange.py \
 	TestFIATSimplex.py \
diff --git a/unittests/pytests/feassemble/testfeassemble.py b/unittests/pytests/feassemble/testfeassemble.py
old mode 100644
new mode 100755
index f29ae66..6ae2b1e
--- a/unittests/pytests/feassemble/testfeassemble.py
+++ b/unittests/pytests/feassemble/testfeassemble.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/friction/Makefile.am b/unittests/pytests/friction/Makefile.am
index eebf18a..ca25136 100644
--- a/unittests/pytests/friction/Makefile.am
+++ b/unittests/pytests/friction/Makefile.am
@@ -24,8 +24,6 @@ SUBDIRS = data
 TESTS = testfriction.py
 dist_check_SCRIPTS = testfriction.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestFrictionModel.py \
 	TestStaticFriction.py \
diff --git a/unittests/pytests/friction/testfriction.py b/unittests/pytests/friction/testfriction.py
old mode 100644
new mode 100755
index 08f35d6..304caf2
--- a/unittests/pytests/friction/testfriction.py
+++ b/unittests/pytests/friction/testfriction.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/materials/Makefile.am b/unittests/pytests/materials/Makefile.am
index 9adae86..940d82b 100644
--- a/unittests/pytests/materials/Makefile.am
+++ b/unittests/pytests/materials/Makefile.am
@@ -24,8 +24,6 @@ SUBDIRS = data
 TESTS = testmaterials.py
 dist_check_SCRIPTS = testmaterials.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestHomogeneous.py \
 	TestMaterial.py \
diff --git a/unittests/pytests/materials/testmaterials.py b/unittests/pytests/materials/testmaterials.py
old mode 100644
new mode 100755
index f5af376..1cc9900
--- a/unittests/pytests/materials/testmaterials.py
+++ b/unittests/pytests/materials/testmaterials.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/meshio/Makefile.am b/unittests/pytests/meshio/Makefile.am
index 8e50e36..7993475 100644
--- a/unittests/pytests/meshio/Makefile.am
+++ b/unittests/pytests/meshio/Makefile.am
@@ -24,8 +24,6 @@ SUBDIRS = data
 TESTS = testmeshio.py
 dist_check_SCRIPTS = testmeshio.py 
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestMeshIOAscii.py \
 	TestMeshIOCubit.py \
diff --git a/unittests/pytests/meshio/testcubit.py b/unittests/pytests/meshio/testcubit.py
old mode 100644
new mode 100755
index 1ffaa14..93a01fc
--- a/unittests/pytests/meshio/testcubit.py
+++ b/unittests/pytests/meshio/testcubit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/meshio/testhdf5.py b/unittests/pytests/meshio/testhdf5.py
old mode 100644
new mode 100755
index ffd5870..7394c2d
--- a/unittests/pytests/meshio/testhdf5.py
+++ b/unittests/pytests/meshio/testhdf5.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/meshio/testmeshio.py b/unittests/pytests/meshio/testmeshio.py
old mode 100644
new mode 100755
index cf0bf02..9150990
--- a/unittests/pytests/meshio/testmeshio.py
+++ b/unittests/pytests/meshio/testmeshio.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/mpi/Makefile.am b/unittests/pytests/mpi/Makefile.am
index 682944e..6dd683c 100644
--- a/unittests/pytests/mpi/Makefile.am
+++ b/unittests/pytests/mpi/Makefile.am
@@ -22,8 +22,6 @@ include $(top_srcdir)/subpackage.am
 TESTS = testmpi.py
 dist_check_SCRIPTS = testmpi.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestCommunicator.py \
 	TestReduce.py
diff --git a/unittests/pytests/mpi/testmpi.py b/unittests/pytests/mpi/testmpi.py
old mode 100644
new mode 100755
index 4c27b3b..f681c4f
--- a/unittests/pytests/mpi/testmpi.py
+++ b/unittests/pytests/mpi/testmpi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/problems/Makefile.am b/unittests/pytests/problems/Makefile.am
index fc7ff26..c701d57 100644
--- a/unittests/pytests/problems/Makefile.am
+++ b/unittests/pytests/problems/Makefile.am
@@ -24,8 +24,6 @@ SUBDIRS = data
 TESTS = testproblems.py
 dist_check_SCRIPTS = testproblems.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestTimeStep.py \
 	TestTimeStepAdapt.py \
diff --git a/unittests/pytests/problems/testproblems.py b/unittests/pytests/problems/testproblems.py
old mode 100644
new mode 100755
index db97670..a470d64
--- a/unittests/pytests/problems/testproblems.py
+++ b/unittests/pytests/problems/testproblems.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/topology/Makefile.am b/unittests/pytests/topology/Makefile.am
index 1bfaec2..b53e5f5 100644
--- a/unittests/pytests/topology/Makefile.am
+++ b/unittests/pytests/topology/Makefile.am
@@ -24,14 +24,6 @@ SUBDIRS = data
 TESTS = testtopology.py
 dist_check_SCRIPTS = testtopology.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
-#if ENABLE_TETGEN
-#  TESTS += testgensimple.py
-#  dist_check_SCRIPTS += testgensimple.py
-#endif
-
-
 noinst_PYTHON = \
 	TestMesh.py \
 	TestSubMesh.py \
@@ -41,7 +33,6 @@ noinst_PYTHON = \
 	TestSolutionFields.py \
 	TestJacobian.py \
 	TestMeshGenerator.py \
-	TestMeshGenSimple.py \
 	TestMeshImporter.py \
 	TestRefineUniform.py
 
diff --git a/unittests/pytests/topology/testtopology.py b/unittests/pytests/topology/testtopology.py
old mode 100644
new mode 100755
index 59a08b3..7fe9842
--- a/unittests/pytests/topology/testtopology.py
+++ b/unittests/pytests/topology/testtopology.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/utils/Makefile.am b/unittests/pytests/utils/Makefile.am
index 61006ff..c2f941c 100644
--- a/unittests/pytests/utils/Makefile.am
+++ b/unittests/pytests/utils/Makefile.am
@@ -24,8 +24,6 @@ dist_check_SCRIPTS = \
 	testmanager.py \
 	testutils.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestEventLogger.py \
 	TestPetscManager.py \
diff --git a/unittests/pytests/utils/testmanager.py b/unittests/pytests/utils/testmanager.py
old mode 100644
new mode 100755
index df697f2..01975c0
--- a/unittests/pytests/utils/testmanager.py
+++ b/unittests/pytests/utils/testmanager.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #
diff --git a/unittests/pytests/utils/testutils.py b/unittests/pytests/utils/testutils.py
old mode 100644
new mode 100755
index e794927..fed8319
--- a/unittests/pytests/utils/testutils.py
+++ b/unittests/pytests/utils/testutils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
 #
 # ======================================================================
 #

More information about the CIG-COMMITS mailing list