From c7b2a44a06f6c64219d5433cb602de18d3530c23 Mon Sep 17 00:00:00 2001
From: Tom Scogland <scogland1@llnl.gov>
Date: Sat, 20 Jul 2024 11:56:11 -0700
Subject: [PATCH] t/300*: add HWLOC_COMPONENTS=-gl to mpi tests

problem: some hwloc versions try to connect to the x11 port if it exists
causing all kinds of problems

solution: set the env var to tell hwloc to not do that
---
 t/t3000-mpi-basic.t | 2 ++
 t/t3003-mpi-abort.t | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/t/t3000-mpi-basic.t b/t/t3000-mpi-basic.t
index c335ed4f30bc..f81983e4bb40 100755
--- a/t/t3000-mpi-basic.t
+++ b/t/t3000-mpi-basic.t
@@ -16,6 +16,8 @@ if ! test -x ${HELLO}; then
     test_done
 fi
 
+# work around https://github.com/open-mpi/ompi/issues/7701 and similar in mpich
+export HWLOC_COMPONENTS=-gl
 export TEST_UNDER_FLUX_CORES_PER_RANK=4
 SIZE=2
 MAX_MPI_SIZE=$(($SIZE*$TEST_UNDER_FLUX_CORES_PER_RANK))
diff --git a/t/t3003-mpi-abort.t b/t/t3003-mpi-abort.t
index 3d3bc335367f..c3e9a116878e 100755
--- a/t/t3003-mpi-abort.t
+++ b/t/t3003-mpi-abort.t
@@ -33,11 +33,13 @@ if ! test -x ${FLUX_BUILD_DIR}/t/mpi/abort; then
     test_done
 fi
 
+# work around https://github.com/open-mpi/ompi/issues/7701 and similar in mpich
+export HWLOC_COMPONENTS=-gl
 export TEST_UNDER_FLUX_CORES_PER_RANK=4
 SIZE=2
 MAX_MPI_SIZE=$(($SIZE*$TEST_UNDER_FLUX_CORES_PER_RANK))
 test_under_flux $SIZE job
-
+set -x
 OPTS="-ocpu-affinity=off"
 
 diag() {