Fix PyImathTest, PyImathNumpyTest, PyIexTest to work in the autotools…

… build. * in Makefile.am, the assignment should be TEST= * in configure.ac, chmod the executable. * in the .in file, use the #!@python@ directive so it works with python2 and python3. Signed-off-by: Cary Phillips <[email protected]>
AcademySoftwareFoundation · Jun 12, 2020 · 6c82409 · 6c82409
1 parent 248abc2
commit 6c82409
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/PyIlmBase/PyIexTest/Makefile.am b/PyIlmBase/PyIexTest/Makefile.am
@@ -7,3 +7,4 @@
 
 # check_PROGRAMS = pyIexTest
 # TESTS = $(check_PROGRAMS)
+TESTS = pyIexTest
diff --git a/PyIlmBase/PyImathNumpyTest/Makefile.am b/PyIlmBase/PyImathNumpyTest/Makefile.am
@@ -8,3 +8,4 @@
 # check_PROGRAMS = pyImathNumpyTest
 
 # TESTS = $(check_PROGRAMS)
+TESTS = pyImathNumpyTest
diff --git a/PyIlmBase/PyImathNumpyTest/pyImathNumpyTest.in b/PyIlmBase/PyImathNumpyTest/pyImathNumpyTest.in
@@ -1,3 +1,5 @@
+#!@PYTHON@
+
 from __future__ import print_function
 
 import sys

diff --git a/PyIlmBase/PyImathTest/Makefile.am b/PyIlmBase/PyImathTest/Makefile.am
@@ -8,3 +8,4 @@
 # check_PROGRAMS = pyImathTest
 
 # TESTS = $(check_PROGRAMS)
+TESTS = pyImathTest
diff --git a/PyIlmBase/PyImathTest/pyImathTest.in b/PyIlmBase/PyImathTest/pyImathTest.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!@PYTHON@
 
 import math
 import random

diff --git a/PyIlmBase/configure.ac b/PyIlmBase/configure.ac
@@ -228,15 +228,16 @@ PyIlmBase.pc
 config/Makefile
 PyIex/Makefile
 PyIexTest/Makefile
-PyIexTest/pyIexTest
 PyImath/Makefile
 PyImathTest/Makefile
-PyImathTest/pyImathTest
 PyImathNumpy/Makefile
 PyImathNumpyTest/Makefile
-PyImathNumpyTest/pyImathNumpyTest
 ])
 
+AC_CONFIG_FILES([PyIexTest/pyIexTest], [chmod +x PyIexTest/pyIexTest])
+AC_CONFIG_FILES([PyImathTest/pyImathTest], [chmod +x PyImathTest/pyImathTest])
+AC_CONFIG_FILES([PyImathNumpyTest/pyImathNumpyTest], [chmod +x PyImathNumpyTest/pyImathNumpyTest])
+
 AC_OUTPUT
 
 AC_MSG_RESULT([
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@

		# check_PROGRAMS = pyIexTest
		# TESTS = $(check_PROGRAMS)
		TESTS = pyIexTest
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@
		# check_PROGRAMS = pyImathNumpyTest

		# TESTS = $(check_PROGRAMS)
		TESTS = pyImathNumpyTest
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@
		# check_PROGRAMS = pyImathTest

		# TESTS = $(check_PROGRAMS)
		TESTS = pyImathTest