Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 27 Jul 2023 04:04:33 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: af0d3a45c57f - main - devel/ga: Add test arguments needed for tests to succeed
Message-ID:  <202307270404.36R44XMX080832@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=af0d3a45c57f8bc217f927cdb974fa0fd36bb180

commit af0d3a45c57f8bc217f927cdb974fa0fd36bb180
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-07-27 03:32:58 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-27 04:04:31 +0000

    devel/ga: Add test arguments needed for tests to succeed
---
 devel/ga/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/devel/ga/Makefile b/devel/ga/Makefile
index 405f32bdff7f..181af06f956b 100644
--- a/devel/ga/Makefile
+++ b/devel/ga/Makefile
@@ -24,11 +24,14 @@ LDFLAGS+=	-lscalapack
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check # test asserts, see https://github.com/GlobalArrays/ga/issues/312
 
+MPIEXEC_ARGS=	-np 2
+
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH # the default should be the same as for the MPI option in math/scalapack
 
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
+MPICH_VARS=		TEST_ARGS+=MPIEXEC="${LOCALBASE}/bin/mpiexec ${MPIEXEC_ARGS}"
 
 OPENMPI_BUILD_DEPENDS=		openmpi>0:net/openmpi
 OPENMPI_RUN_DEPENDS=		openmpi>0:net/openmpi
@@ -38,5 +41,6 @@ OPENMPI_CONFIGURE_ENV=		CC=${LOCALBASE}/mpi/openmpi/bin/mpicc MPICC=${LOCALBASE}
 				FC=${LOCALBASE}/mpi/openmpi/bin/mpif90 MPIFC=${LOCALBASE}/mpi/openmpi/bin/mpif90 \
 				LDFLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib"
 OPENMPI_MAKE_ARGS=		FREEBSD_LINK_FLAGS="-L${LOCALBASE}/mpi/openmpi/lib -Wl,-rpath,${LOCALBASE}/mpi/openmpi/lib -lmpi"
+OPENMPI_VARS=			TEST_ARGS+=MPIEXEC="${LOCALBASE}/mpi/openmpi/bin/mpiexec ${MPIEXEC_ARGS}"
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307270404.36R44XMX080832>