Merge pull request #4550 from grondo/t2315-fix

testsuite: fix spurious resource norestrict test failures on some version of hwloc

Author: mergify[bot]

t/t2315-resource-system.t

@@ -2,6 +2,8 @@
 
 test_description='Test resource module with system instance config'
 
+# Append --logfile option if FLUX_TESTS_LOGFILE is set in environment:
+test -n "$FLUX_TESTS_LOGFILE" && set -- "$@" --logfile
 . `dirname $0`/sharness.sh
 
 if which hwloc-bind > /dev/null; then
@@ -134,7 +136,7 @@ test_expect_success HAVE_JQ,MULTICORE 'resource norestrict option works' '
 	hwloc-bind core:0 flux start -s1 \
 		-o,--config-path=$(pwd)/${name},-Slog-filename=${name}/logfile \
 		flux mini run -N1 --exclusive \
-		  sh -c "hwloc-bind --get | hwloc-calc --number-of core" \
+		  sh -c "hwloc-bind --get | hwloc-calc --number-of core | tail -n1" \
 		    >${name}/ncores &&
 	test_debug "cat ${name}/ncores" &&
 	test $(cat ${name}/ncores) = $NCORES