[cig-commits] [commit] baagaard/update-autoconf: More cleanup for changes in automake test target. (da4bbde)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Aug 18 17:12:11 PDT 2014
Repository : https://github.com/geodynamics/pylith
On branch : baagaard/update-autoconf
Link : https://github.com/geodynamics/pylith/compare/87db39ca000b0547b70483775c3e48f37fec1ac6...da4bbde82df409a8751725832d86a3f56ac5a215
>---------------------------------------------------------------
commit da4bbde82df409a8751725832d86a3f56ac5a215
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Mon Aug 18 17:12:22 2014 -0700
More cleanup for changes in automake test target.
Move test stuff from subpackage.am to check.am.
Use check.am in unittests and full-scale tests.
Update full-scale tests for automake 1.13.
>---------------------------------------------------------------
da4bbde82df409a8751725832d86a3f56ac5a215
.../meshing/surface_nurbs/Makefile.am => check.am | 10 +++-------
subpackage.am | 20 --------------------
tests_auto/2d/quad4/Makefile.am | 8 +++-----
tests_auto/2d/quad4/testpylith.py | 2 +-
tests_auto/2d/tri3/Makefile.am | 8 +++-----
tests_auto/2d/tri3/testpylith.py | 2 +-
tests_auto/3d/hex8/Makefile.am | 7 +++----
tests_auto/3d/hex8/testpylith.py | 2 +-
tests_auto/3d/tet4/Makefile.am | 7 +++----
tests_auto/3d/tet4/testpylith.py | 2 +-
tests_auto/eqinfo/Makefile.am | 5 ++---
tests_auto/eqinfo/test_eqinfo.py | 0
tests_auto/petsc/Makefile.am | 4 ++--
tests_auto/petsc/testpetsc.py | 2 +-
unittests/libtests/bc/Makefile.am | 3 +--
unittests/libtests/faults/Makefile.am | 1 +
unittests/libtests/feassemble/Makefile.am | 1 +
unittests/libtests/friction/Makefile.am | 1 +
unittests/libtests/materials/Makefile.am | 1 +
unittests/libtests/meshio/Makefile.am | 1 +
unittests/libtests/topology/Makefile.am | 1 +
unittests/libtests/utils/Makefile.am | 1 +
unittests/pytests/bc/Makefile.am | 3 +--
unittests/pytests/faults/Makefile.am | 3 +--
unittests/pytests/feassemble/Makefile.am | 3 +--
unittests/pytests/friction/Makefile.am | 3 +--
unittests/pytests/materials/Makefile.am | 3 +--
unittests/pytests/meshio/Makefile.am | 3 +--
unittests/pytests/mpi/Makefile.am | 3 +--
unittests/pytests/problems/Makefile.am | 3 +--
unittests/pytests/topology/Makefile.am | 3 +--
unittests/pytests/utils/Makefile.am | 3 +--
32 files changed, 42 insertions(+), 77 deletions(-)
diff --git a/examples/meshing/surface_nurbs/Makefile.am b/check.am
similarity index 77%
copy from examples/meshing/surface_nurbs/Makefile.am
copy to check.am
index e61fa8d..8498b93 100644
--- a/examples/meshing/surface_nurbs/Makefile.am
+++ b/check.am
@@ -16,15 +16,11 @@
# ----------------------------------------------------------------------
#
-SUBDIRS = \
- dem \
- triangles \
- merge_surfs \
- subduction
+AM_CPPFLAGS = -I$(top_srcdir)/libsrc
-dist_noinst_DATA = \
- README
+check-local: $(TEST_LOGS)
+ for f in $(TEST_LOGS); do printf "\n=== $$f ===\n\n"; cat $$f; done
# End of file
diff --git a/subpackage.am b/subpackage.am
index 13bf811..fd678d6 100644
--- a/subpackage.am
+++ b/subpackage.am
@@ -23,26 +23,6 @@ subpkgpythondir = $(pkgpythondir)/$(subpackage)
subpkgpyexecdir = $(pkgpyexecdir)/$(subpackage)
subpkgdatadir = $(pkgdatadir)/$(subpackage)
-# 'export' the project headers by performing a mock install
-export_incdir = $(top_builddir)/include/$(PACKAGE)
-export-subpkgincludeHEADERS: $(subpkginclude_HEADERS)
- $(MAKE) $(AM_MAKEFLAGS) pkgincludedir=$(export_incdir) install-subpkgincludeHEADERS
- touch $@
-
-clean-subpkgincludeHEADERS:
- $(MAKE) $(AM_MAKEFLAGS) pkgincludedir=$(export_incdir) uninstall-subpkgincludeHEADERS
-
-export-nobase_subpkgincludeHEADERS: $(nobase_subpkginclude_HEADERS)
- $(MAKE) $(AM_MAKEFLAGS) pkgincludedir=$(export_incdir) install-nobase_subpkgincludeHEADERS
- touch $@
-
-clean-nobase_subpkgincludeHEADERS:
- $(MAKE) $(AM_MAKEFLAGS) pkgincludedir=$(export_incdir) uninstall-nobase_subpkgincludeHEADERS
-
-AM_CPPFLAGS = -I$(top_srcdir)/libsrc
-
-check-local:
- for f in $(TEST_LOGS); do printf "\n=== $$f ===\n\n"; cat $$f; done
# End of file
diff --git a/tests_auto/2d/quad4/Makefile.am b/tests_auto/2d/quad4/Makefile.am
index 5c626bf..10a7f8b 100644
--- a/tests_auto/2d/quad4/Makefile.am
+++ b/tests_auto/2d/quad4/Makefile.am
@@ -16,6 +16,8 @@
# ----------------------------------------------------------------------
#
+include $(top_srcdir)/check.am
+
TESTS = testpylith.py
check_SCRIPTS = testpylith.py
@@ -52,8 +54,7 @@ dist_noinst_PYTHON = \
slipweakening_compression_soln.py \
slipweakening_shear_stick_soln.py \
slipweakening_shear_sliding_soln.py \
- slipweakening_opening_soln.py \
- testpylith.py
+ slipweakening_opening_soln.py
dist_noinst_DATA = \
geometry.jou \
@@ -77,9 +78,6 @@ dist_noinst_DATA = \
slipweakening_opening.cfg
-TESTS_ENVIRONMENT = $(PYTHON)
-
-
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests_auto/2d/quad4
export-data: $(dist_noinst_PYTHON) $(dist_noinst_DATA)
diff --git a/tests_auto/2d/quad4/testpylith.py b/tests_auto/2d/quad4/testpylith.py
old mode 100644
new mode 100755
index 3d12032..a58cc71
--- a/tests_auto/2d/quad4/testpylith.py
+++ b/tests_auto/2d/quad4/testpylith.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
#
# ======================================================================
#
diff --git a/tests_auto/2d/tri3/Makefile.am b/tests_auto/2d/tri3/Makefile.am
index 1f36d2e..a80988e 100644
--- a/tests_auto/2d/tri3/Makefile.am
+++ b/tests_auto/2d/tri3/Makefile.am
@@ -16,6 +16,8 @@
# ----------------------------------------------------------------------
#
+include $(top_srcdir)/check.am
+
TESTS = testpylith.py
check_SCRIPTS = testpylith.py
@@ -34,8 +36,7 @@ dist_noinst_PYTHON = \
TestSlipOneFault.py \
sliponefault_soln.py \
TestSlipTwoFaults.py \
- sliptwofaults_soln.py \
- testpylith.py
+ sliptwofaults_soln.py
dist_noinst_DATA = \
geometry.jou \
@@ -55,9 +56,6 @@ noinst_TMP = \
shear_disp.spatialdb
-TESTS_ENVIRONMENT = $(PYTHON)
-
-
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests_auto/2d/tri3
export-data: $(dist_noinst_PYTHON) $(dist_noinst_DATA)
diff --git a/tests_auto/2d/tri3/testpylith.py b/tests_auto/2d/tri3/testpylith.py
old mode 100644
new mode 100755
index a08bbc6..8c3d90d
--- a/tests_auto/2d/tri3/testpylith.py
+++ b/tests_auto/2d/tri3/testpylith.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
#
# ======================================================================
#
diff --git a/tests_auto/3d/hex8/Makefile.am b/tests_auto/3d/hex8/Makefile.am
index 128b0ae..c4e91bb 100644
--- a/tests_auto/3d/hex8/Makefile.am
+++ b/tests_auto/3d/hex8/Makefile.am
@@ -16,6 +16,8 @@
# ----------------------------------------------------------------------
#
+include $(top_srcdir)/check.am
+
TESTS = testpylith.py
check_SCRIPTS = testpylith.py
@@ -35,8 +37,7 @@ dist_noinst_PYTHON = \
TestSlipTwoFaults.py \
sliptwofaults_soln.py \
TestFrictionNoSlip.py \
- TestFrictionNoSlipHalo.py \
- testpylith.py
+ TestFrictionNoSlipHalo.py
dist_noinst_DATA = \
@@ -58,8 +59,6 @@ noinst_TMP = \
shear_dispy.spatialdb \
shear_dispz.spatialdb
-TESTS_ENVIRONMENT = $(PYTHON)
-
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests_auto/3d/hex8
diff --git a/tests_auto/3d/hex8/testpylith.py b/tests_auto/3d/hex8/testpylith.py
old mode 100644
new mode 100755
index 9b560dc..4c5c3ed
--- a/tests_auto/3d/hex8/testpylith.py
+++ b/tests_auto/3d/hex8/testpylith.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
#
# ======================================================================
#
diff --git a/tests_auto/3d/tet4/Makefile.am b/tests_auto/3d/tet4/Makefile.am
index 54b2bb5..f3227b5 100644
--- a/tests_auto/3d/tet4/Makefile.am
+++ b/tests_auto/3d/tet4/Makefile.am
@@ -16,6 +16,8 @@
# ----------------------------------------------------------------------
#
+include $(top_srcdir)/check.am
+
TESTS = testpylith.py
check_SCRIPTS = testpylith.py
@@ -33,8 +35,7 @@ dist_noinst_PYTHON = \
TestSlipOneFault.py \
sliponefault_soln.py \
TestSlipTwoFaults.py \
- sliptwofaults_soln.py \
- testpylith.py
+ sliptwofaults_soln.py
dist_noinst_DATA = \
@@ -57,8 +58,6 @@ noinst_TMP = \
shear_dispy.spatialdb \
shear_dispz.spatialdb
-TESTS_ENVIRONMENT = $(PYTHON)
-
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests_auto/3d/tet4
diff --git a/tests_auto/3d/tet4/testpylith.py b/tests_auto/3d/tet4/testpylith.py
old mode 100644
new mode 100755
index a488d7b..e293cb6
--- a/tests_auto/3d/tet4/testpylith.py
+++ b/tests_auto/3d/tet4/testpylith.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
#
# ======================================================================
#
diff --git a/tests_auto/eqinfo/Makefile.am b/tests_auto/eqinfo/Makefile.am
index 3397f14..a2b6a0a 100644
--- a/tests_auto/eqinfo/Makefile.am
+++ b/tests_auto/eqinfo/Makefile.am
@@ -16,6 +16,8 @@
# ----------------------------------------------------------------------
#
+include $(top_srcdir)/check.am
+
if ENABLE_HDF5
TESTS = test_eqinfo.py
endif
@@ -46,9 +48,6 @@ noinst_TMP = \
stats_quad4.py
-TESTS_ENVIRONMENT = $(PYTHON)
-
-
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests_auto/eqinfo
export-data: $(dist_noinst_PYTHON) $(dist_noinst_DATA)
diff --git a/tests_auto/eqinfo/test_eqinfo.py b/tests_auto/eqinfo/test_eqinfo.py
old mode 100644
new mode 100755
diff --git a/tests_auto/petsc/Makefile.am b/tests_auto/petsc/Makefile.am
index 5330ab0..e9d163e 100644
--- a/tests_auto/petsc/Makefile.am
+++ b/tests_auto/petsc/Makefile.am
@@ -16,6 +16,8 @@
# ----------------------------------------------------------------------
#
+include $(top_srcdir)/check.am
+
TESTS = testpetsc.py
dist_check_SCRIPTS = testpetsc.py
@@ -27,8 +29,6 @@ noinst_DATA =
noinst_TMP =
-TESTS_ENVIRONMENT = $(PYTHON)
-
# 'export' the input files by performing a mock install
export_datadir = $(top_builddir)/tests_auto/petsc
diff --git a/tests_auto/petsc/testpetsc.py b/tests_auto/petsc/testpetsc.py
old mode 100644
new mode 100755
index db9697f..27e1ebf
--- a/tests_auto/petsc/testpetsc.py
+++ b/tests_auto/petsc/testpetsc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env nemesis
#
# ======================================================================
#
diff --git a/unittests/libtests/bc/Makefile.am b/unittests/libtests/bc/Makefile.am
index d0dfb4f..a929a38 100644
--- a/unittests/libtests/bc/Makefile.am
+++ b/unittests/libtests/bc/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = bc
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/libtests/faults/Makefile.am b/unittests/libtests/faults/Makefile.am
index aa17c75..b9ed2cc 100644
--- a/unittests/libtests/faults/Makefile.am
+++ b/unittests/libtests/faults/Makefile.am
@@ -18,6 +18,7 @@
subpackage = faults
include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/libtests/feassemble/Makefile.am b/unittests/libtests/feassemble/Makefile.am
index c5fd518..043d540 100644
--- a/unittests/libtests/feassemble/Makefile.am
+++ b/unittests/libtests/feassemble/Makefile.am
@@ -18,6 +18,7 @@
subpackage = feassemble
include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/libtests/friction/Makefile.am b/unittests/libtests/friction/Makefile.am
index 393d0b2..d595283 100644
--- a/unittests/libtests/friction/Makefile.am
+++ b/unittests/libtests/friction/Makefile.am
@@ -18,6 +18,7 @@
subpackage = friction
include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/libtests/materials/Makefile.am b/unittests/libtests/materials/Makefile.am
index 5137fe8..ba11658 100644
--- a/unittests/libtests/materials/Makefile.am
+++ b/unittests/libtests/materials/Makefile.am
@@ -18,6 +18,7 @@
subpackage = materials
include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/libtests/meshio/Makefile.am b/unittests/libtests/meshio/Makefile.am
index 4d0d302..a686462 100644
--- a/unittests/libtests/meshio/Makefile.am
+++ b/unittests/libtests/meshio/Makefile.am
@@ -18,6 +18,7 @@
subpackage = meshio
include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/libtests/topology/Makefile.am b/unittests/libtests/topology/Makefile.am
index 0de9cb5..7d6a21f 100644
--- a/unittests/libtests/topology/Makefile.am
+++ b/unittests/libtests/topology/Makefile.am
@@ -18,6 +18,7 @@
subpackage = topology
include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/libtests/utils/Makefile.am b/unittests/libtests/utils/Makefile.am
index c0c9216..c44e796 100644
--- a/unittests/libtests/utils/Makefile.am
+++ b/unittests/libtests/utils/Makefile.am
@@ -18,6 +18,7 @@
subpackage = utils
include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
TESTS = testutils
diff --git a/unittests/pytests/bc/Makefile.am b/unittests/pytests/bc/Makefile.am
index cfc13d0..b16fe79 100644
--- a/unittests/pytests/bc/Makefile.am
+++ b/unittests/pytests/bc/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = bc
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/pytests/faults/Makefile.am b/unittests/pytests/faults/Makefile.am
index c57a3c1..4dc1bd5 100644
--- a/unittests/pytests/faults/Makefile.am
+++ b/unittests/pytests/faults/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = faults
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/pytests/feassemble/Makefile.am b/unittests/pytests/feassemble/Makefile.am
index f28de0d..3863437 100644
--- a/unittests/pytests/feassemble/Makefile.am
+++ b/unittests/pytests/feassemble/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = feassemble
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/pytests/friction/Makefile.am b/unittests/pytests/friction/Makefile.am
index ca25136..648a3cb 100644
--- a/unittests/pytests/friction/Makefile.am
+++ b/unittests/pytests/friction/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = friction
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/pytests/materials/Makefile.am b/unittests/pytests/materials/Makefile.am
index 940d82b..c991cae 100644
--- a/unittests/pytests/materials/Makefile.am
+++ b/unittests/pytests/materials/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = materials
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/pytests/meshio/Makefile.am b/unittests/pytests/meshio/Makefile.am
index 7993475..1cc15bc 100644
--- a/unittests/pytests/meshio/Makefile.am
+++ b/unittests/pytests/meshio/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = meshio
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/pytests/mpi/Makefile.am b/unittests/pytests/mpi/Makefile.am
index 6dd683c..3660dde 100644
--- a/unittests/pytests/mpi/Makefile.am
+++ b/unittests/pytests/mpi/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = bc
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
TESTS = testmpi.py
dist_check_SCRIPTS = testmpi.py
diff --git a/unittests/pytests/problems/Makefile.am b/unittests/pytests/problems/Makefile.am
index c701d57..e737637 100644
--- a/unittests/pytests/problems/Makefile.am
+++ b/unittests/pytests/problems/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = problems
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/pytests/topology/Makefile.am b/unittests/pytests/topology/Makefile.am
index b53e5f5..783ac5f 100644
--- a/unittests/pytests/topology/Makefile.am
+++ b/unittests/pytests/topology/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = topology
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
SUBDIRS = data
diff --git a/unittests/pytests/utils/Makefile.am b/unittests/pytests/utils/Makefile.am
index c2f941c..960702f 100644
--- a/unittests/pytests/utils/Makefile.am
+++ b/unittests/pytests/utils/Makefile.am
@@ -16,8 +16,7 @@
# ----------------------------------------------------------------------
#
-subpackage = utils
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
TESTS = testmanager.py testutils.py
dist_check_SCRIPTS = \
More information about the CIG-COMMITS
mailing list