]> granicus.if.org Git - recode/commitdiff
Allow tests to run on macOS (fixes #12)
authorReuben Thomas <rrt@sc3d.org>
Wed, 26 Sep 2018 08:32:45 +0000 (09:32 +0100)
committerReuben Thomas <rrt@sc3d.org>
Wed, 26 Sep 2018 08:32:45 +0000 (09:32 +0100)
Thanks to Ryan Schmidt for the fix.

.travis.yml
tests/Makefile.am

index 13974020d7452101b852d1b1cca563f8e3360819..72dfdda813a029e9e490e6c4a5c610b12eea6fe7 100644 (file)
@@ -57,6 +57,4 @@ install:
 script:
   - ./bootstrap
   - ./configure --enable-silent-rules CC=$COMPILER
-  - make
-  # The Cython-built Python extension doesn’t work without make install on macOS
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make install && make check ; else make distcheck ; fi
+  - make && make distcheck
index 3dea44f2a14b81aa99cf50c169b678074ec73303..1dacf6050b1810ca270baf3dec177fb85688b95a 100644 (file)
@@ -34,6 +34,7 @@ DISTCLEANFILES = Recode.c
 check-local: Recode@pyextext@
        if test -n "$(VALGRIND)"; then export VALGRIND='$(VALGRIND) --suppressions=$(srcdir)/valgrind-python.supp'; fi; \
        export LD_LIBRARY_PATH=$(top_builddir)/src/@objdir@; \
+       export DYLD_LIBRARY_PATH=$(top_builddir)/src/@objdir@; \
        RECODE=$(top_builddir)/src/recode$(EXEEXT) PYTHONPATH=.:$(srcdir) \
          $$VALGRIND $(PYTHON) $(srcdir)/pytest $(LIMIT) $(srcdir)/t*.py