hack/test-port-forwarding.pl: use platform-independent path on hostSocket

Signed-off-by: Norio Nomura <[email protected]>

Author: norio-nomura

hack/test-port-forwarding.pl

@@ -16,6 +16,7 @@
 use warnings;
 
 use Config qw(%Config);
+use File::Spec::Functions qw(catfile);
 use IO::Handle qw();
 use Socket qw(inet_ntoa);
 use Sys::Hostname qw(hostname);
@@ -35,6 +36,8 @@
 
 my $instDir = qx(limactl list "$instance" --yq .dir);
 chomp $instDir;
+# platform independent way to add trailing path separator
+my $sockDir = catfile($instDir, "sock", "");
 
 # If $instance is a filename, add our portForwards to it to enable testing
 if (-f $instance) {
@@ -97,10 +100,10 @@
     s/sshLocalPort/$sshLocalPort/g;
     s/ipv4/$ipv4/g;
     s/ipv6/$ipv6/g;
-    s/instDir/$instDir/g;
+    s/sockDir\//$sockDir/g;
     # forward: 127.0.0.1 899 → 127.0.0.1 799
     # ignore: 127.0.0.2 8888
-    /^(forward|ignore):\s+([0-9.:]+)\s+(\d+)(?:\s+→)?(?:\s+(?:([0-9.:]+)(?:\s+(\d+))|(\/\S+))?)?/;
+    /^(forward|ignore):\s+([0-9.:]+)\s+(\d+)(?:\s+→)?(?:\s+(?:([0-9.:]+)(?:\s+(\d+))|(\S+))?)?/;
     die "Cannot parse test '$_'" unless $1;
     my %test; @test{qw(mode guest_ip guest_port host_ip host_port host_socket)} = ($1, $2, $3, $4, $5, $6);
 
@@ -350,6 +353,6 @@ sub JoinHostPort {
   hostIP: 0.0.0.0
 
 - guestPort: 5000
-  hostSocket: "{{.Dir}}/sock/port5000.sock"
+  hostSocket: port5000.sock
 
-  # forward: 127.0.0.1 5000 → instDir/sock/port5000.sock
+  # forward: 127.0.0.1 5000 → sockDir/port5000.sock