On Wed 09/09/2020 14:33, Elias M. Mariani wrote:
> > On 2020/09/09 17:29, Bjorn Ketelaars wrote:
> > Please sort RDEPS, and group MODPY_*.
> Done.
>
> > 'make test' fails. Maybe this is something that can be fixed by
> > MODPY_ADJ_FILES?
> On Wed, Sep 9, 2020 at 2:05 PM Stuart Henderson <[email protected]> wrote:
> > or symlink MODPY_BIN to WRKDIR/bin/python ..
>
> I think is better to just call to each file.
> It seems that They are moving to pytest on the next version:
> https://github.com/gnome-terminator/terminator/blob/master/pytest.ini
>
> So, changes will be needed anyways...
> Let me know what you guys think.
I think the diff below is a bit nicer:
diff --git Makefile Makefile
index 71e93e721d7..0fe60145b8b 100644
--- Makefile
+++ Makefile
@@ -36,8 +36,7 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_DISTUTILS_INSTALL = install --prefix=${LOCALBASE} --root=${DESTDIR}
do-test:
- ${MODPY_BIN} ${WRKDIST}/tests/test_doctests.py
- ${MODPY_BIN} ${WRKDIST}/tests/testborg.py
- ${MODPY_BIN} ${WRKDIST}/tests/testsignalman.py
+ ${SUBST_CMD} ${WRKSRC}/run_tests
+ cd ${WRKSRC} && /bin/sh ./run_tests
.include <bsd.port.mk>
diff --git patches/patch-run_tests patches/patch-run_tests
new file mode 100644
index 00000000000..5ece2504985
--- /dev/null
+++ patches/patch-run_tests
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: run_tests
+--- run_tests.orig
++++ run_tests
+@@ -4,7 +4,7 @@ for t in tests/test*; do
+ echo $t
+ file_type=$(file -b $t)
+ case ${file_type} in
+- *[Pp]ython*) python ${t} ;;
++ *[Pp]ython*) ${MODPY_BIN} ${t} ;;
+ *Bourne*) bash ${t} ;;
+ *bash*) bash ${t} ;;
+ *perl*) perl ${t} ;;
