[cig-commits] [commit] baagaard/update-autoconf: Cleanup and update for automake 1.13. (473ea3d)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Tue Aug 19 09:23:11 PDT 2014


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

On branch  : baagaard/update-autoconf
Link       : https://github.com/geodynamics/spatialdata/compare/0000000000000000000000000000000000000000...473ea3d9dd7315efc81bd16966e607cfa86cf5cf

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

commit 473ea3d9dd7315efc81bd16966e607cfa86cf5cf
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue Aug 19 09:21:34 2014 -0700

    Cleanup and update for automake 1.13.
    
    Switch from INCLUDES to AM_CPPFLAGS.
    Create check.am and module.am.
    Eliminate use of TEST_ENVIRONMENT = $(PYTHON) (incompatible with
    automake 1.13).


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

473ea3d9dd7315efc81bd16966e607cfa86cf5cf
 templates/spatialdb/tests/Makefile.am => check.am | 10 ++++------
 configure.ac                                      | 15 ++++++++-------
 {tests/pytests => libsrc}/Makefile.am             |  7 ++-----
 libsrc/spatialdata/Makefile.am                    |  7 ++-----
 libsrc/spatialdata/geocoords/Makefile.am          |  5 -----
 libsrc/spatialdata/spatialdb/Makefile.am          |  5 -----
 libsrc/spatialdata/units/Makefile.am              |  4 ----
 libsrc/spatialdata/utils/Makefile.am              |  4 ----
 modulesrc/geocoords/Makefile.am                   |  5 ++---
 modulesrc/{Makefile.am => module.am}              | 13 ++++++-------
 modulesrc/spatialdb/Makefile.am                   |  5 ++---
 modulesrc/units/Makefile.am                       |  5 ++---
 subpackage.am                                     | 18 ------------------
 templates/spatialdb/Makefile.am                   |  4 +---
 tests/libtests/geocoords/Makefile.am              |  7 ++-----
 tests/libtests/spatialdb/Makefile.am              |  7 +++----
 tests/libtests/units/Makefile.am                  |  8 +++-----
 tests/libtests/utils/Makefile.am                  |  5 ++---
 tests/pytests/geocoords/Makefile.am               |  4 ++--
 tests/pytests/geocoords/testgeocoords.py          |  0
 tests/pytests/spatialdb/Makefile.am               |  4 ++--
 tests/pytests/spatialdb/test_sceccvmh.py          |  0
 tests/pytests/spatialdb/testspatial.py            |  0
 tests/pytests/units/Makefile.am                   |  4 ++--
 tests/pytests/units/testunits.py                  |  0
 tests/pytests/utils/Makefile.am                   |  5 +----
 tests/pytests/utils/testutils.py                  |  0
 27 files changed, 46 insertions(+), 105 deletions(-)

diff --git a/templates/spatialdb/tests/Makefile.am b/check.am
similarity index 64%
copy from templates/spatialdb/tests/Makefile.am
copy to check.am
index d042e2a..dd1104b 100644
--- a/templates/spatialdb/tests/Makefile.am
+++ b/check.am
@@ -7,20 +7,18 @@
 # This code was developed as part of the Computational Infrastructure
 # for Geodynamics (http://geodynamics.org).
 #
-# Copyright (c) 2010-2013 University of California, Davis
+# Copyright (c) 2010-2014 University of California, Davis
 #
 # See COPYING for license information.
 #
 # ----------------------------------------------------------------------
 #
 
-TESTS = testcontrib.py
-dist_check_SCRIPTS = testcontrib.py
+AM_CPPFLAGS = -I$(top_srcdir)/libsrc
 
-TESTS_ENVIRONMENT = $(PYTHON)
 
-noinst_PYTHON = \
-	TestUniformVelModel.py 
+check-local: $(TEST_LOGS)
+	for f in $(TEST_LOGS); do printf "\n=== $$f ===\n\n"; cat $$f; done
 
 
 # End of file
diff --git a/configure.ac b/configure.ac
index 648fa59..6969a25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_INIT([spatialdata], [1.9.3], [baagaard at usgs.gov])
 AC_CONFIG_HEADER([portinfo])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 # ----------------------------------------------------------------------
 # SWIG
@@ -108,7 +108,7 @@ if test "$enable_pythia" = "yes" ; then
   AC_LANG(C++)
 
   # Check for Python modules and packages.
-  AM_PATH_PYTHON([2.3])
+  AM_PATH_PYTHON([2.4])
   AC_ARG_VAR(PYTHON, [Python interpreter])
   AC_ARG_VAR(PYTHONPATH, [Python module search path])
   CIT_PYTHON_SYSCONFIG
@@ -148,11 +148,12 @@ AC_C_BIGENDIAN
 # ----------------------------------------------------------------------
 AC_CONFIG_FILES([Makefile
 	libsrc/Makefile
-	libsrc/geocoords/Makefile
-	libsrc/geocoords/data/Makefile
-	libsrc/spatialdb/Makefile
-	libsrc/units/Makefile
-	libsrc/utils/Makefile
+	libsrc/spatialdata/Makefile
+	libsrc/spatialdata/geocoords/Makefile
+	libsrc/spatialdata/geocoords/data/Makefile
+	libsrc/spatialdata/spatialdb/Makefile
+	libsrc/spatialdata/units/Makefile
+	libsrc/spatialdata/utils/Makefile
 	modulesrc/Makefile
 	modulesrc/include/Makefile
 	modulesrc/geocoords/Makefile
diff --git a/tests/pytests/Makefile.am b/libsrc/Makefile.am
similarity index 80%
copy from tests/pytests/Makefile.am
copy to libsrc/Makefile.am
index aae57bc..47726a8 100644
--- a/tests/pytests/Makefile.am
+++ b/libsrc/Makefile.am
@@ -7,7 +7,7 @@
 # This code was developed as part of the Computational Infrastructure
 # for Geodynamics (http://geodynamics.org).
 #
-# Copyright (c) 2010-2013 University of California, Davis
+# Copyright (c) 2010-2014 University of California, Davis
 #
 # See COPYING for license information.
 #
@@ -15,10 +15,7 @@
 #
 
 SUBDIRS = \
-	geocoords \
-	spatialdb \
-	units \
-	utils
+	spatialdata
 
 
 # End of file 
diff --git a/libsrc/spatialdata/Makefile.am b/libsrc/spatialdata/Makefile.am
index 7d7e0e7..ebec405 100644
--- a/libsrc/spatialdata/Makefile.am
+++ b/libsrc/spatialdata/Makefile.am
@@ -61,11 +61,8 @@ libspatialdata_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-AM_CPPFLAGS = -DDATADIR=$(pkgdatadir)/geocoords \
-	$(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
-
-INCLUDES = -I$(top_builddir)/include
-
+AM_CPPFLAGS = -I$(top_srcdir)/libsrc
+AM_CPPFLAGS += -DDATADIR=$(pkgdatadir)/geocoords $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
 
 
 # End of file 
diff --git a/libsrc/spatialdata/geocoords/Makefile.am b/libsrc/spatialdata/geocoords/Makefile.am
index dacf8db..1e39cc6 100644
--- a/libsrc/spatialdata/geocoords/Makefile.am
+++ b/libsrc/spatialdata/geocoords/Makefile.am
@@ -41,9 +41,4 @@ subpkginclude_HEADERS = \
 
 noinst_HEADERS =
 
-# export
-clean-local: clean-subpkgincludeHEADERS
-BUILT_SOURCES = export-subpkgincludeHEADERS
-CLEANFILES = export-subpkgincludeHEADERS
-
 # End of file 
diff --git a/libsrc/spatialdata/spatialdb/Makefile.am b/libsrc/spatialdata/spatialdb/Makefile.am
index 2de5623..1ffe32c 100644
--- a/libsrc/spatialdata/spatialdb/Makefile.am
+++ b/libsrc/spatialdata/spatialdb/Makefile.am
@@ -50,10 +50,5 @@ subpkginclude_HEADERS = \
 
 noinst_HEADERS =
 
-# export
-clean-local: clean-subpkgincludeHEADERS
-BUILT_SOURCES = export-subpkgincludeHEADERS
-CLEANFILES = export-subpkgincludeHEADERS
-
 
 # End of file 
diff --git a/libsrc/spatialdata/units/Makefile.am b/libsrc/spatialdata/units/Makefile.am
index 33d95c2..b9b7811 100644
--- a/libsrc/spatialdata/units/Makefile.am
+++ b/libsrc/spatialdata/units/Makefile.am
@@ -25,9 +25,5 @@ subpkginclude_HEADERS = \
 
 noinst_HEADERS =
 
-# export
-clean-local: clean-subpkgincludeHEADERS
-BUILT_SOURCES = export-subpkgincludeHEADERS
-CLEANFILES = export-subpkgincludeHEADERS
 
 # End of file 
diff --git a/libsrc/spatialdata/utils/Makefile.am b/libsrc/spatialdata/utils/Makefile.am
index 799b6b9..449c8dd 100644
--- a/libsrc/spatialdata/utils/Makefile.am
+++ b/libsrc/spatialdata/utils/Makefile.am
@@ -25,9 +25,5 @@ subpkginclude_HEADERS = \
 
 noinst_HEADERS =
 
-# export
-clean-local: clean-subpkgincludeHEADERS
-BUILT_SOURCES = export-subpkgincludeHEADERS
-CLEANFILES = export-subpkgincludeHEADERS
 
 # End of file 
diff --git a/modulesrc/geocoords/Makefile.am b/modulesrc/geocoords/Makefile.am
index 9dfbea2..1c84b36 100644
--- a/modulesrc/geocoords/Makefile.am
+++ b/modulesrc/geocoords/Makefile.am
@@ -16,6 +16,7 @@
 
 subpackage = geocoords
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _geocoordsmodule.la
 subpkgpyexec_PYTHON = geocoords.py
@@ -40,14 +41,12 @@ _geocoordsmodule_la_LDFLAGS = -module -avoid-version \
 dist__geocoordsmodule_la_SOURCES = $(swig_sources) $(swig_generated)
 
 _geocoordsmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/libspatialdata.la
+	$(top_builddir)/libsrc/spatialdata/libspatialdata.la
 if NO_UNDEFINED
 _geocoordsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
-
 if ENABLE_SWIG
 $(srcdir)/geocoords_wrap.cxx $(srcdir)/geocoords.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
diff --git a/modulesrc/Makefile.am b/modulesrc/module.am
similarity index 67%
copy from modulesrc/Makefile.am
copy to modulesrc/module.am
index 4e4b055..841a375 100644
--- a/modulesrc/Makefile.am
+++ b/modulesrc/module.am
@@ -7,18 +7,17 @@
 # This code was developed as part of the Computational Infrastructure
 # for Geodynamics (http://geodynamics.org).
 #
-# Copyright (c) 2010-2013 University of California, Davis
+# Copyright (c) 2010-2014 University of California, Davis
 #
 # See COPYING for license information.
 #
 # ----------------------------------------------------------------------
 #
 
-SUBDIRS = \
-	include \
-	geocoords \
-	spatialdb \
-	units
-
+AM_CPPFLAGS = \
+	$(PYTHON_EGG_CPPFLAGS) \
+	-I$(top_srcdir)/libsrc \
+	-I$(NUMPY_INCDIR) \
+	-I$(PYTHON_INCDIR)
 
 # End of file
diff --git a/modulesrc/spatialdb/Makefile.am b/modulesrc/spatialdb/Makefile.am
index 51f0f62..c13140c 100644
--- a/modulesrc/spatialdb/Makefile.am
+++ b/modulesrc/spatialdb/Makefile.am
@@ -16,6 +16,7 @@
 
 subpackage = spatialdb
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _spatialdbmodule.la
 
@@ -50,14 +51,12 @@ _spatialdbmodule_la_LDFLAGS = -module -avoid-version \
 dist__spatialdbmodule_la_SOURCES = $(swig_sources) $(swig_generated)
 
 _spatialdbmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/libspatialdata.la
+	$(top_builddir)/libsrc/spatialdata/libspatialdata.la
 if NO_UNDEFINED
 _spatialdbmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
-
 if ENABLE_SWIG
 $(srcdir)/spatialdb_wrap.cxx $(srcdir)/spatialdb.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
diff --git a/modulesrc/units/Makefile.am b/modulesrc/units/Makefile.am
index 2d7e845..5f918d4 100644
--- a/modulesrc/units/Makefile.am
+++ b/modulesrc/units/Makefile.am
@@ -16,6 +16,7 @@
 
 subpackage = units
 include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/modulesrc/module.am
 
 subpkgpyexec_LTLIBRARIES = _unitsmodule.la
 subpkgpyexec_PYTHON = units.py
@@ -34,14 +35,12 @@ _unitsmodule_la_LDFLAGS = -module -avoid-version \
 dist__unitsmodule_la_SOURCES = $(swig_sources) $(swig_generated)
 
 _unitsmodule_la_LIBADD = \
-	$(top_builddir)/libsrc/libspatialdata.la
+	$(top_builddir)/libsrc/spatialdata/libspatialdata.la
 if NO_UNDEFINED
 _unitsmodule_la_LIBADD += \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
 endif
 
-INCLUDES += -I$(PYTHON_INCDIR)
-
 if ENABLE_SWIG
 $(srcdir)/units_wrap.cxx $(srcdir)/units.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
diff --git a/subpackage.am b/subpackage.am
index fa19209..5866509 100644
--- a/subpackage.am
+++ b/subpackage.am
@@ -21,23 +21,5 @@ 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
-
-INCLUDES = -I$(top_builddir)/include
-
 
 # End of file 
diff --git a/templates/spatialdb/Makefile.am b/templates/spatialdb/Makefile.am
index 68cb09c..b9504a1 100644
--- a/templates/spatialdb/Makefile.am
+++ b/templates/spatialdb/Makefile.am
@@ -56,8 +56,6 @@ endif
 # Preprocessor flags
 AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
 
-INCLUDES = 
-
 # SWIG PYTHON MODULE ---------------------------------------------------
 # The name of the module will be _spatialdbcontribmodule.MACHINE_DEPENDENT_SUFFIX
 subpkgpyexec_LTLIBRARIES = _spatialdbcontribmodule.la
@@ -92,7 +90,7 @@ _spatialdbcontribmodule_la_LIBADD += \
 endif
 
 # Module uses numpy and Python header files
-INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
+AM_CPPFLAGS = -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
 
 # Command to invoke SWIG
 $(srcdir)/spatialdbcontrib_wrap.cxx $(srcdir)/spatialdbcontrib.py: $(swig_sources)
diff --git a/tests/libtests/geocoords/Makefile.am b/tests/libtests/geocoords/Makefile.am
index 069ac75..6d77342 100644
--- a/tests/libtests/geocoords/Makefile.am
+++ b/tests/libtests/geocoords/Makefile.am
@@ -14,8 +14,7 @@
 # ----------------------------------------------------------------------
 #
 
-subpackage = geocoords
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
 
 SUBDIRS = data
 
@@ -46,10 +45,8 @@ noinst_HEADERS = \
 
 testgeocoords_LDFLAGS =
 
-INCLUDES +=
-
 testgeocoords_LDADD = \
-	$(top_builddir)/libsrc/libspatialdata.la \
+	$(top_builddir)/libsrc/spatialdata/libspatialdata.la \
 	-lproj \
 	-lcppunit -ldl \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
diff --git a/tests/libtests/spatialdb/Makefile.am b/tests/libtests/spatialdb/Makefile.am
index 217b8ea..606c076 100644
--- a/tests/libtests/spatialdb/Makefile.am
+++ b/tests/libtests/spatialdb/Makefile.am
@@ -14,8 +14,7 @@
 # ----------------------------------------------------------------------
 #
 
-subpackage = spatialdb
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
 
 SUBDIRS = data
 
@@ -69,10 +68,10 @@ noinst_HEADERS = \
 
 testspatial_LDFLAGS =
 
-AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
+AM_CPPFLAGS += $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) 
 
 testspatial_LDADD = \
-	$(top_builddir)/libsrc/libspatialdata.la \
+	$(top_builddir)/libsrc/spatialdata/libspatialdata.la \
 	-lproj \
 	-lcppunit -ldl \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
diff --git a/tests/libtests/units/Makefile.am b/tests/libtests/units/Makefile.am
index c04e025..d190387 100644
--- a/tests/libtests/units/Makefile.am
+++ b/tests/libtests/units/Makefile.am
@@ -14,8 +14,7 @@
 # ----------------------------------------------------------------------
 #
 
-subpackage = units
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
 
 TESTS = testunits
 
@@ -30,14 +29,13 @@ noinst_HEADERS = \
 	TestNondimensional.hh \
 	TestParser.hh
 
-AM_CPPFLAGS = \
-	$(PETSC_INCLUDE) -I$(PYTHON_INCDIR) $(PYTHON_EGG_CPPFLAGS)
+AM_CPPFLAGS += -I$(PYTHON_INCDIR) $(PYTHON_EGG_CPPFLAGS)
 
 testunits_LDFLAGS = \
 	$(AM_LDFLAGS) $(PYTHON_LA_LDFLAGS)
 
 testunits_LDADD = \
-	$(top_builddir)/libsrc/libspatialdata.la \
+	$(top_builddir)/libsrc/spatialdata/libspatialdata.la \
 	-lproj \
 	-lcppunit -ldl \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
diff --git a/tests/libtests/utils/Makefile.am b/tests/libtests/utils/Makefile.am
index 46f0adf..378a2bc 100644
--- a/tests/libtests/utils/Makefile.am
+++ b/tests/libtests/utils/Makefile.am
@@ -14,8 +14,7 @@
 # ----------------------------------------------------------------------
 #
 
-subpackage = utils
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
 
 SUBDIRS = data
 
@@ -33,7 +32,7 @@ noinst_HEADERS = \
 testutils_LDFLAGS =
 
 testutils_LDADD = \
-	$(top_builddir)/libsrc/libspatialdata.la \
+	$(top_builddir)/libsrc/spatialdata/libspatialdata.la \
 	-lproj \
 	-lcppunit -ldl \
 	$(PYTHON_BLDLIBRARY) $(PYTHON_LIBS) $(PYTHON_SYSLIBS)
diff --git a/tests/pytests/geocoords/Makefile.am b/tests/pytests/geocoords/Makefile.am
index ee861c8..cc1003d 100644
--- a/tests/pytests/geocoords/Makefile.am
+++ b/tests/pytests/geocoords/Makefile.am
@@ -14,11 +14,11 @@
 # ----------------------------------------------------------------------
 #
 
+include $(top_srcdir)/check.am
+
 TESTS = testgeocoords.py
 dist_check_SCRIPTS = testgeocoords.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestConverter.py \
 	TestCSCart.py \
diff --git a/tests/pytests/geocoords/testgeocoords.py b/tests/pytests/geocoords/testgeocoords.py
old mode 100644
new mode 100755
diff --git a/tests/pytests/spatialdb/Makefile.am b/tests/pytests/spatialdb/Makefile.am
index 8e3ee0c..d7d487e 100644
--- a/tests/pytests/spatialdb/Makefile.am
+++ b/tests/pytests/spatialdb/Makefile.am
@@ -14,6 +14,8 @@
 # ----------------------------------------------------------------------
 #
 
+include $(top_srcdir)/check.am
+
 SUBDIRS = data
 
 TESTS = testspatial.py
@@ -24,8 +26,6 @@ if ENABLE_SCEC_CVM_H
   dist_check_SCRIPTS += test_sceccvmh.py
 endif
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestCompositeDB.py \
 	TestGenSimpleDBApp.py \
diff --git a/tests/pytests/spatialdb/test_sceccvmh.py b/tests/pytests/spatialdb/test_sceccvmh.py
old mode 100644
new mode 100755
diff --git a/tests/pytests/spatialdb/testspatial.py b/tests/pytests/spatialdb/testspatial.py
old mode 100644
new mode 100755
diff --git a/tests/pytests/units/Makefile.am b/tests/pytests/units/Makefile.am
index 758c164..3c8377c 100644
--- a/tests/pytests/units/Makefile.am
+++ b/tests/pytests/units/Makefile.am
@@ -14,11 +14,11 @@
 # ----------------------------------------------------------------------
 #
 
+include $(top_srcdir)/check.am
+
 TESTS = testunits.py
 dist_check_SCRIPTS = testunits.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestNondimensional.py \
 	TestNondimElasticQuasistatic.py \
diff --git a/tests/pytests/units/testunits.py b/tests/pytests/units/testunits.py
old mode 100644
new mode 100755
diff --git a/tests/pytests/utils/Makefile.am b/tests/pytests/utils/Makefile.am
index 716ac56..dcbc982 100644
--- a/tests/pytests/utils/Makefile.am
+++ b/tests/pytests/utils/Makefile.am
@@ -14,14 +14,11 @@
 # ----------------------------------------------------------------------
 #
 
-subpackage = utils
-include $(top_srcdir)/subpackage.am
+include $(top_srcdir)/check.am
 
 TESTS = testutils.py
 dist_check_SCRIPTS = testutils.py
 
-TESTS_ENVIRONMENT = $(PYTHON)
-
 noinst_PYTHON = \
 	TestChangeCoordSys.py \
 	TestConvertApp.py
diff --git a/tests/pytests/utils/testutils.py b/tests/pytests/utils/testutils.py
old mode 100644
new mode 100755



More information about the CIG-COMMITS mailing list