On 2018/08/20 13:40, Klemens Nanni wrote:
> On Mon, Aug 20, 2018 at 01:22:10PM +0200, Rafael Sadowski wrote:
> > rspamd is a camke port and SEPARATE_BUILD is always set by cmake.port.mk
> Right (not sure now why I set it in the first place).
>
> Rest still stands.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/rspamd/Makefile,v
> retrieving revision 1.55
> diff -u -p -r1.55 Makefile
> --- Makefile 1 Aug 2018 17:11:44 -0000 1.55
> +++ Makefile 20 Aug 2018 11:40:03 -0000
> @@ -20,19 +20,19 @@ WANTLIB += intl luajit-5.1 m magic pcre
>
> MODULES= devel/cmake
> LIB_DEPENDS= databases/sqlite3 \
> - devel/libmagic \
> devel/gettext \
> devel/glib2 \
> + devel/libmagic \
> devel/pcre \
> lang/luajit \
> textproc/icu4c
> BUILD_DEPENDS+= devel/ragel
> # /var/rspamd needs to exist for tests to run
> -TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH}
> -TEST_DEPENDS += databases/redis \
> +TEST_DEPENDS= ${FULLPKGNAME}:${FULLPKGPATH}
> +TEST_DEPENDS+= databases/redis \
> + devel/py-robotframework \
> sysutils/py-psutil \
> - textproc/py-demjson \
> - devel/py-robotframework
> + textproc/py-demjson
>
> CONFIGURE_ARGS+=-DOPENBSD_BUILD=1 \
> -DCMAKE_C_OPT_FLAGS="${CFLAGS}" \
> @@ -45,10 +45,11 @@ CONFIGURE_ARGS+=-DOPENBSD_BUILD=1 \
> -DRSPAMD_GROUP="_rspamd"
>
> # Make sure we pick up the base libevent, never the ports one!
> -CONFIGURE_ARGS += -DLIBEVENT_ROOT_DIR=/usr
> +CONFIGURE_ARGS+= -DLIBEVENT_ROOT_DIR=/usr
OK for the above
> -# Make sure you have no rspamd or redis instances running and note that the
> -# test suite uses the network.
> -#
> +
> +TEST_IS_INTERACTIVE= Make sure you have no rspamd or redis instances running
> \
> + and note that the test suite uses the network.
> +
> # In the event of failing tests, look at log.html in ${WRKSRC}
> do-test:
> cd ${WRKSRC} && \
>
Please skip this, it's not interactive and runs ok in normal conditions,
no need to block it from a run of non-interactive tests in bulk if
anyone cares to do such a thing.
