From aac3b313236df4c43f100fd15ab1e6496d7436bd Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Tue, 30 Apr 2019 07:56:27 +0200 Subject: [PATCH] Applied updates --- .travis.yml | 17 +++++++++++++---- configure.ac | 2 +- m4/libbfio.m4 | 7 ++++--- m4/libcdata.m4 | 7 ++++--- m4/libcerror.m4 | 7 ++++--- m4/libcfile.m4 | 7 ++++--- m4/libclocale.m4 | 7 ++++--- m4/libcnotify.m4 | 7 ++++--- m4/libcpath.m4 | 7 ++++--- m4/libcsplit.m4 | 7 ++++--- m4/libcthreads.m4 | 7 ++++--- m4/libfcache.m4 | 7 ++++--- m4/libfdata.m4 | 7 ++++--- m4/libfvalue.m4 | 7 ++++--- m4/libuna.m4 | 7 ++++--- m4/python.m4 | 26 ++++++++++++++------------ tests/Makefile.am | 1 - tests/vslvm_test_macros.h | 7 +++++++ 18 files changed, 87 insertions(+), 57 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2171ee..9dcd410 100644 --- a/.travis.yml +++ b/.travis.yml @@ -189,7 +189,7 @@ matrix: compiler: gcc os: osx osx_image: xcode8.3 - - name: "Mac OS gcc and pkgbuild" + - name: "Mac OS gcc and Python module and pkgbuild" env: - CONFIGURE_OPTIONS="--disable-dependency-tracking --prefix=/usr/local --enable-python --with-pyprefix" - TARGET="macos-gcc-pkgbuild" @@ -224,9 +224,18 @@ script: - if test ${TARGET} = "linux-gcc-python-setup-py" || test ${TARGET} = "macos-gcc-python-setup-py"; then ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && python ./setup.py build; elif test ${TARGET} != "coverity"; then - ./configure ${CONFIGURE_OPTIONS} && make > /dev/null && make check CHECK_WITH_STDERR=1; - if test $? -ne 0 && test -f tests/test-suite.log; then - cat tests/test-suite.log; + ./configure ${CONFIGURE_OPTIONS} && make > /dev/null; RESULT=$?; + if test ${RESULT} -eq 0; then + if test ${TARGET} = "macos-gcc-python" || test ${TARGET} = "macos-gcc-pkgbuild"; then + install_name_tool -change /usr/local/lib/libvslvm.1.dylib ${PWD}/libvslvm/.libs/libvslvm.1.dylib ./pyvslvm/.libs/pyvslvm.so; + fi; + make check CHECK_WITH_STDERR=1; RESULT=$?; + fi; + if test ${RESULT} -ne 0; then + if test -f tests/test-suite.log; then + cat tests/test-suite.log; + fi; + return ${RESULT}; fi; if test ${TARGET} = "macos-gcc-pkgbuild"; then VERSION=`sed '5!d; s/^ \[//;s/\],$//' configure.ac` && diff --git a/configure.ac b/configure.ac index d2b5cf2..98e5acb 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ( 2.59 ) AC_INIT( [libvslvm], - [20190306], + [20190430], [joachim.metz@gmail.com]) AC_CONFIG_SRCDIR( diff --git a/m4/libbfio.m4 b/m4/libbfio.m4 index c24be0b..c09e774 100644 --- a/m4/libbfio.m4 +++ b/m4/libbfio.m4 @@ -1,6 +1,6 @@ dnl Checks for libbfio required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libbfio is available dnl ac_libbfio_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBBFIO_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libbfio" = xno], [ac_cv_libbfio=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libbfio=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libbfio" != x && test "x$ac_cv_with_libbfio" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBBFIO_CHECK_LIB], [no such directory: $ac_cv_with_libbfio], [1]) ]) - ac_cv_libbfio=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libcdata.m4 b/m4/libcdata.m4 index 2624f15..1cb58c3 100644 --- a/m4/libcdata.m4 +++ b/m4/libcdata.m4 @@ -1,6 +1,6 @@ dnl Checks for libcdata required headers and functions dnl -dnl Version: 20190112 +dnl Version: 20190308 dnl Function to detect if libcdata is available dnl ac_libcdata_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBCDATA_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcdata" = xno], [ac_cv_libcdata=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libcdata=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libcdata" != x && test "x$ac_cv_with_libcdata" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCDATA_CHECK_LIB], [no such directory: $ac_cv_with_libcdata], [1]) ]) - ac_cv_libcdata=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libcerror.m4 b/m4/libcerror.m4 index 38ba4d9..755722f 100644 --- a/m4/libcerror.m4 +++ b/m4/libcerror.m4 @@ -1,6 +1,6 @@ dnl Checks for libcerror required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libcerror is available dnl ac_libcerror_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcerror" = xno], [ac_cv_libcerror=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libcerror=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libcerror" != x && test "x$ac_cv_with_libcerror" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCERROR_CHECK_LIB], [no such directory: $ac_cv_with_libcerror], [1]) ]) - ac_cv_libcerror=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libcfile.m4 b/m4/libcfile.m4 index d380eca..5cfd03d 100644 --- a/m4/libcfile.m4 +++ b/m4/libcfile.m4 @@ -1,6 +1,6 @@ dnl Checks for libcfile required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libcfile is available dnl ac_libcfile_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBCFILE_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcfile" = xno], [ac_cv_libcfile=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libcfile=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libcfile" != x && test "x$ac_cv_with_libcfile" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCFILE_CHECK_LIB], [no such directory: $ac_cv_with_libcfile], [1]) ]) - ac_cv_libcfile=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libclocale.m4 b/m4/libclocale.m4 index eda6c5e..21508a3 100644 --- a/m4/libclocale.m4 +++ b/m4/libclocale.m4 @@ -1,6 +1,6 @@ dnl Checks for libclocale required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libclocale is available dnl ac_libclocale_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBCLOCALE_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libclocale" = xno], [ac_cv_libclocale=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libclocale=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libclocale" != x && test "x$ac_cv_with_libclocale" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCLOCALE_CHECK_LIB], [no such directory: $ac_cv_with_libclocale], [1]) ]) - ac_cv_libclocale=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libcnotify.m4 b/m4/libcnotify.m4 index 29711e1..4c69aad 100644 --- a/m4/libcnotify.m4 +++ b/m4/libcnotify.m4 @@ -1,6 +1,6 @@ dnl Checks for libcnotify required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libcnotify is available dnl ac_libcnotify_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBCNOTIFY_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcnotify" = xno], [ac_cv_libcnotify=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libcnotify=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libcnotify" != x && test "x$ac_cv_with_libcnotify" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCNOTIFY_CHECK_LIB], [no such directory: $ac_cv_with_libcnotify], [1]) ]) - ac_cv_libcnotify=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libcpath.m4 b/m4/libcpath.m4 index 32881f1..7a6fcc0 100644 --- a/m4/libcpath.m4 +++ b/m4/libcpath.m4 @@ -1,6 +1,6 @@ dnl Checks for libcpath required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libcpath is available dnl ac_libcpath_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBCPATH_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcpath" = xno], [ac_cv_libcpath=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libcpath=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libcpath" != x && test "x$ac_cv_with_libcpath" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCPATH_CHECK_LIB], [no such directory: $ac_cv_with_libcpath], [1]) ]) - ac_cv_libcpath=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libcsplit.m4 b/m4/libcsplit.m4 index 74afe1d..4b8e5e3 100644 --- a/m4/libcsplit.m4 +++ b/m4/libcsplit.m4 @@ -1,6 +1,6 @@ dnl Checks for libcsplit required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libcsplit is available dnl ac_libcsplit_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBCSPLIT_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcsplit" = xno], [ac_cv_libcsplit=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libcsplit=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libcsplit" != x && test "x$ac_cv_with_libcsplit" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCSPLIT_CHECK_LIB], [no such directory: $ac_cv_with_libcsplit], [1]) ]) - ac_cv_libcsplit=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libcthreads.m4 b/m4/libcthreads.m4 index bcd1a47..5971958 100644 --- a/m4/libcthreads.m4 +++ b/m4/libcthreads.m4 @@ -1,6 +1,6 @@ dnl Checks for libcthreads required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libcthreads is available dnl ac_libcthreads_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBCTHREADS_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libcthreads" = xno], [ac_cv_libcthreads=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libcthreads=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libcthreads" != x && test "x$ac_cv_with_libcthreads" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBCTHREADS_CHECK_LIB], [no such directory: $ac_cv_with_libcthreads], [1]) ]) - ac_cv_libcthreads=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libfcache.m4 b/m4/libfcache.m4 index a102605..0299d49 100644 --- a/m4/libfcache.m4 +++ b/m4/libfcache.m4 @@ -1,6 +1,6 @@ dnl Checks for libfcache required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libfcache is available dnl ac_libfcache_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBFCACHE_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libfcache" = xno], [ac_cv_libfcache=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libfcache=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libfcache" != x && test "x$ac_cv_with_libfcache" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBFCACHE_CHECK_LIB], [no such directory: $ac_cv_with_libfcache], [1]) ]) - ac_cv_libfcache=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libfdata.m4 b/m4/libfdata.m4 index d26086f..19e96f2 100644 --- a/m4/libfdata.m4 +++ b/m4/libfdata.m4 @@ -1,6 +1,6 @@ dnl Functions for libfdata dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libfdata is available dnl ac_libfdata_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBFDATA_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libfdata" = xno], [ac_cv_libfdata=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libfdata=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libfdata" != x && test "x$ac_cv_with_libfdata" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBFDATA_CHECK_LIB], [no such directory: $ac_cv_with_libfdata], [1]) ]) - ac_cv_libfdata=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libfvalue.m4 b/m4/libfvalue.m4 index 6d2317b..6d0df6b 100644 --- a/m4/libfvalue.m4 +++ b/m4/libfvalue.m4 @@ -1,6 +1,6 @@ dnl Checks for libfvalue required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libfvalue is available dnl ac_libfvalue_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBFVALUE_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libfvalue" = xno], [ac_cv_libfvalue=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libfvalue=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libfvalue" != x && test "x$ac_cv_with_libfvalue" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBFVALUE_CHECK_LIB], [no such directory: $ac_cv_with_libfvalue], [1]) ]) - ac_cv_libfvalue=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/libuna.m4 b/m4/libuna.m4 index 9096e07..da2a77d 100644 --- a/m4/libuna.m4 +++ b/m4/libuna.m4 @@ -1,6 +1,6 @@ dnl Checks for libuna or required headers and functions dnl -dnl Version: 20181117 +dnl Version: 20190308 dnl Function to detect if libuna is available dnl ac_libuna_dummy is used to prevent AC_CHECK_LIB adding unnecessary -l arguments @@ -8,7 +8,8 @@ AC_DEFUN([AX_LIBUNA_CHECK_LIB], [AS_IF( [test "x$ac_cv_enable_shared_libs" = xno || test "x$ac_cv_with_libuna" = xno], [ac_cv_libuna=no], - [dnl Check if the directory provided as parameter exists + [ac_cv_libuna=check + dnl Check if the directory provided as parameter exists AS_IF( [test "x$ac_cv_with_libuna" != x && test "x$ac_cv_with_libuna" != xauto-detect], [AS_IF( @@ -19,7 +20,7 @@ AC_DEFUN([AX_LIBUNA_CHECK_LIB], [no such directory: $ac_cv_with_libuna], [1]) ]) - ac_cv_libuna=check], + ], [dnl Check for a pkg-config file AS_IF( [test "x$cross_compiling" != "xyes" && test "x$PKGCONFIG" != "x"], diff --git a/m4/python.m4 b/m4/python.m4 index 35b1926..666995c 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -1,6 +1,6 @@ dnl Functions for Python bindings dnl -dnl Version: 20170830 +dnl Version: 20190316 dnl Function to check if the python binary is available dnl "python${PYTHON_VERSION} python python# python#.#" @@ -8,17 +8,13 @@ AC_DEFUN([AX_PROG_PYTHON], [AS_IF( [test "x${PYTHON_VERSION}" != x], [ax_python_progs="python${PYTHON_VERSION}"], - [ax_python_progs="python python2 python2.7 python2.6 python2.5 python3 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0"]) + [ax_python_progs="python python2 python2.7 python2.6 python2.5 python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0"]) AC_CHECK_PROGS( [PYTHON], [$ax_python_progs]) AS_IF( [test "x${PYTHON}" != x], [ax_prog_python_version=`${PYTHON} -c "import sys; sys.stdout.write(sys.version[[:3]])" 2>/dev/null`; - AC_SUBST( - [PYTHON_VERSION], - [$ax_prog_python_version]) - ax_prog_python_platform=`${PYTHON} -c "import sys; sys.stdout.write(sys.platform)" 2>/dev/null`; AC_SUBST( [PYTHON_PLATFORM], @@ -62,7 +58,7 @@ AC_DEFUN([AX_PROG_PYTHON2], dnl Function to check if the python3 binary is available dnl "python3 python3.#" AC_DEFUN([AX_PROG_PYTHON3], - [ax_python3_progs="python3 python3.4 python3.3 python3.2 python3.1 python3.0" + [ax_python3_progs="python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0" AC_CHECK_PROGS( [PYTHON3], [$ax_python3_progs]) @@ -90,10 +86,16 @@ dnl Function to check if the python-config binary is available dnl "python${PYTHON_VERSION}-config python-config" AC_DEFUN([AX_PROG_PYTHON_CONFIG], [AS_IF( - [test "x${PYTHON}" != x], + [test "x${PYTHON_CONFIG}" = x && test "x${PYTHON_VERSION}" != x], + [AC_CHECK_PROGS( + [PYTHON_CONFIG], + [python${PYTHON_VERSION}-config]) + ]) + AS_IF( + [test "x${PYTHON_CONFIG}" = x], [AC_CHECK_PROGS( [PYTHON_CONFIG], - [python${PYTHON_VERSION}-config python-config]) + [python-config]) ]) AS_IF( [test "x${PYTHON_CONFIG}" = x], @@ -108,7 +110,7 @@ AC_DEFUN([AX_PROG_PYTHON_CONFIG], dnl Function to check if the python2-config binary is available AC_DEFUN([AX_PROG_PYTHON2_CONFIG], [AS_IF( - [test "x${PYTHON2}" != x], + [test "x${PYTHON2_CONFIG}" = x], [AC_CHECK_PROGS( [PYTHON2_CONFIG], [python2-config]) @@ -126,7 +128,7 @@ AC_DEFUN([AX_PROG_PYTHON2_CONFIG], dnl Function to check if the python3-config binary is available AC_DEFUN([AX_PROG_PYTHON3_CONFIG], [AS_IF( - [test "x${PYTHON3}" != x], + [test "x${PYTHON3_CONFIG}" = x], [AC_CHECK_PROGS( [PYTHON3_CONFIG], [python3-config]) @@ -185,7 +187,7 @@ AC_DEFUN([AX_PYTHON_CHECK], AS_IF( [test "x${ac_cv_header_python_h}" != xyes], [ac_cv_enable_python=no], - [ac_cv_enable_python=$PYTHON_VERSION + [ac_cv_enable_python=${ax_prog_python_version} AC_SUBST( [PYTHON_CPPFLAGS], [$PYTHON_INCLUDES]) diff --git a/tests/Makefile.am b/tests/Makefile.am index b3c4338..be757ff 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,7 +24,6 @@ endif TESTS = \ test_library.sh \ - test_manpage.sh \ test_vslvminfo.sh \ $(TESTS_PYVSLVM) diff --git a/tests/vslvm_test_macros.h b/tests/vslvm_test_macros.h index ae51ea8..b8eaf59 100644 --- a/tests/vslvm_test_macros.h +++ b/tests/vslvm_test_macros.h @@ -99,6 +99,13 @@ goto on_error; \ } +#define VSLVM_TEST_ASSERT_NOT_EQUAL_SSIZE( name, value, expected_value ) \ + if( value == expected_value ) \ + { \ + fprintf( stdout, "%s:%d %s (%" PRIzd ") == %" PRIzd "\n", __FILE__, __LINE__, name, value, expected_value ); \ + goto on_error; \ + } + #define VSLVM_TEST_ASSERT_EQUAL_INT8( name, value, expected_value ) \ if( value != expected_value ) \ { \