Simon Bonnefoy / ctools

Commit ef8439a75ea1f45d8ff5f1dd38b094b541f86ac9

Authored by Jürgen Knödlseder
1 parent 80625161

Rename test_python to test_python_ctools

Inline Side-by-side
Showing 7 changed files with 8 additions and 8 deletions
.gitignore
  View file @ef8439a
... ... @@ -79,7 +79,7 @@ test/butterfly.txt
79 79 test/model.reg
80 80 test/obs.reg
81 81 test/.coverage
82   -test/test_python.sh
  82 +test/test_python_ctools.sh
83 83 test/test_python_cscripts.sh
84 84 examples/*.fits
85 85 examples/*.xml
... ...
configure.ac
  View file @ef8439a
... ... @@ -997,7 +997,7 @@ AC_CONFIG_FILES([Makefile
997 997 src/ctools-setup
998 998 test/Makefile
999 999 test/test_cscripts.sh
1000   - test/test_python.sh
  1000 + test/test_python_ctools.sh
1001 1001 test/test_python_cscripts.sh
1002 1002 pyext/Makefile
1003 1003 pyext/setup.py
... ... @@ -1010,7 +1010,7 @@ AC_CONFIG_FILES([Makefile
1010 1010 ctools.pc
1011 1011 testconf.sh],
1012 1012 [if test -f test/test_cscripts.sh; then chmod +x test/test_cscripts.sh; fi;
1013   - if test -f test/test_python.sh; then chmod +x test/test_python.sh; fi;
  1013 + if test -f test/test_python_ctools.sh; then chmod +x test/test_python_ctools.sh; fi;
1014 1014 if test -f test/test_python_cscripts.sh; then chmod +x test/test_python_cscripts.sh; fi;
1015 1015 if test -f testconf.sh; then chmod +x testconf.sh; fi])
1016 1016 AC_OUTPUT
... ...
pyext/Makefile.am
  View file @ef8439a
... ... @@ -31,7 +31,7 @@ if WITH_PYTHON
31 31  
32 32 # Test scripts to be distributed in $(pyexecdir)/ctools/tests
33 33 testscripts = ctools/tests/__init__.py \
34   - ../test/test_python.py \
  34 + ../test/test_python_ctools.py \
35 35 ../test/test_ctobssim.py \
36 36 ../test/test_ctselect.py \
37 37 ../test/test_ctbin.py \
... ...
pyext/ctools/tools.i
  View file @ef8439a
... ... @@ -64,6 +64,6 @@
64 64 /* __ Test function ______________________________________________________ */
65 65 %pythoncode %{
66 66 def test():
67   - from ctools.tests import test_python
68   - test_python.test(installed=True)
  67 + from ctools.tests import test_python_ctools
  68 + test_python_ctools.test(installed=True)
69 69 %}
70 70 \ No newline at end of file
... ...
test/Makefile.am
  View file @ef8439a
... ... @@ -7,7 +7,7 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
7 7 # Optional python bindings
8 8 if WITH_PYTHON
9 9 TEST_CSCRIPTS = test_cscripts.sh
10   - TEST_PYTHON_CTOOLS = test_python.sh
  10 + TEST_PYTHON_CTOOLS = test_python_ctools.sh
11 11 TEST_PYTHON_CSCRIPTS = test_python_cscripts.sh
12 12 TEST_PYTHON_ENV = PYTHONPATH=$(top_builddir):$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools/ctools:$(pythondir):$(pyexecdir):$(PYTHONPATH)
13 13 endif
... ...
test/test_python.py renamed to test/test_python_ctools.py
  View file @ef8439a
test/test_python.sh.in renamed to test/test_python_ctools.sh.in
  View file @ef8439a
... ... @@ -22,4 +22,4 @@
22 22 #
23 23 # Run the Python test
24 24 # ===================
25   -@PYTHON_COVERAGE@./test_python.py
  25 +@PYTHON_COVERAGE@./test_python_ctools.py
... ...