git: 246f922d635e - stable/14 - ggate tests: Use unique ports among tests

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Fri, 20 Sep 2024 11:39:55 UTC
The branch stable/14 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=246f922d635e114c336c1e15ce041a1d8496ea60

commit 246f922d635e114c336c1e15ce041a1d8496ea60
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-06-15 00:10:42 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-09-20 11:39:16 +0000

    ggate tests: Use unique ports among tests
    
    This helps avoid failures when running tests in parallel.
    
    MFC after:      1 week
    
    (cherry picked from commit b5d3f8252fe8b74249ed49e87981d190c3ec3d05)
---
 tests/sys/geom/class/gate/ggate_test.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/sys/geom/class/gate/ggate_test.sh b/tests/sys/geom/class/gate/ggate_test.sh
index 3ca5c3a2531a..4cbc5d80ae89 100644
--- a/tests/sys/geom/class/gate/ggate_test.sh
+++ b/tests/sys/geom/class/gate/ggate_test.sh
@@ -1,7 +1,5 @@
-
 PIDFILE=ggated.pid
 PLAINFILES=plainfiles
-PORT=33080
 CONF=gg.exports
 
 atf_test_case ggatec_trim cleanup
@@ -17,13 +15,14 @@ ggatec_trim_body()
 {
 	load_ggate
 
+	port=33080
 	us=$(alloc_ggate_dev)
 	work=$(alloc_md)
 	atf_check -e ignore -o ignore dd if=/dev/random of=/dev/$work bs=1m count=1 conv=notrunc
 	echo $CONF >> $PLAINFILES
 	echo "localhost RW /dev/$work" > $CONF
-	atf_check ggated -p $PORT -F $PIDFILE $CONF
-	atf_check ggatec create -p $PORT -u $us localhost /dev/$work
+	atf_check ggated -p $port -F $PIDFILE $CONF
+	atf_check ggatec create -p $port -u $us localhost /dev/$work
 	ggate_dev=/dev/ggate${us}
 	wait_for_ggate_device ${ggate_dev}
 
@@ -55,6 +54,7 @@ ggated_body()
 
 	load_ggate
 
+	port=33081
 	us=$(alloc_ggate_dev)
 	work=$(alloc_md)
 	src=$(alloc_md)
@@ -67,8 +67,8 @@ ggated_body()
 	echo $CONF >> $PLAINFILES
 	echo "127.0.0.1 RW /dev/$work" > $CONF
 
-	atf_check ggated -p $PORT -F $PIDFILE $CONF
-	atf_check ggatec create -p $PORT -u $us 127.0.0.1 /dev/$work
+	atf_check ggated -p $port -F $PIDFILE $CONF
+	atf_check ggatec create -p $port -u $us 127.0.0.1 /dev/$work
 
 	ggate_dev=/dev/ggate${us}