make check both py2 and py3

This commit is contained in:
John Cupitt 2014-12-12 14:50:31 +00:00
parent b4b8b8bd96
commit a9109904c1
4 changed files with 31 additions and 9 deletions

3
TODO
View File

@ -1,3 +1,6 @@
- update gtkdoc Makefile.am ... copy the sample in examples/Makefile.am in the
gtkdoc sources
- use vips_resize() in vipsthumbnail? - use vips_resize() in vipsthumbnail?
should the sharpening filter be selectable? should the sharpening filter be selectable?

View File

@ -1,6 +1,12 @@
# -*- Mode: Python; py-indent-offset: 4 -*- # -*- Mode: Python; py-indent-offset: 4 -*-
# vim: tabstop=4 shiftwidth=4 expandtab # vim: tabstop=4 shiftwidth=4 expandtab
from __future__ import division
from builtins import map
from builtins import str
from builtins import range
from builtins import object
# overrides for pygobject gobject-introspection binding for libvips, tested # overrides for pygobject gobject-introspection binding for libvips, tested
# with python2.7 and python3.4 # with python2.7 and python3.4
@ -30,12 +36,6 @@
# #
# These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk # These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
from __future__ import division
from builtins import map
from builtins import str
from builtins import range
from builtins import object
import sys import sys
import re import re
import logging import logging

View File

@ -12,14 +12,15 @@ EXTRA_DIST = \
test_conversion.py test_conversion.py
# don't run test_thumbnail.sh by default, it takes ages # don't run test_thumbnail.sh by default, it takes ages
# test with python2 and python3 ... we are supposed to work with either
TESTS = \ TESTS = \
test_cli.sh \ test_cli.sh \
test_formats.sh \ test_formats.sh \
test_seq.sh \ test_seq.sh \
test_threading.sh \ test_threading.sh \
test_arithmetic.py \ test_python.sh
test_colour.py \
test_conversion.py
clean-local: clean-local:
-rm -rf tmp -rm -rf tmp

18
test/test_python.sh Executable file
View File

@ -0,0 +1,18 @@
#!/bin/sh
# set -x
. ./variables.sh
echo "testing with python2 ..."
python2 test_arithmetic.py
python2 test_colour.py
python2 test_conversion.py
echo "testing with python3 ..."
python3 test_colour.py
python3 test_arithmetic.py
python3 test_conversion.py