From 5fbf1470bd3c784f1b50f874dcf70d99a9867e00 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 24 Oct 2021 21:24:24 -0400 Subject: [PATCH] (perl) machines file: support machine lines with multiple spaces between fields --- src/lib/Hydra/Helper/Nix.pm | 2 +- t/Helper/Nix.t | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/lib/Hydra/Helper/Nix.pm b/src/lib/Hydra/Helper/Nix.pm index 09908c92..a8ba1ff3 100644 --- a/src/lib/Hydra/Helper/Nix.pm +++ b/src/lib/Hydra/Helper/Nix.pm @@ -347,7 +347,7 @@ sub getMachines { chomp($line); $line =~ s/\#.*$//g; next if $line =~ /^\s*$/; - my @tokens = split /\s/, $line; + my @tokens = split /\s+/, $line; if (!defined($tokens[5]) || $tokens[5] eq "-") { $tokens[5] = ""; diff --git a/t/Helper/Nix.t b/t/Helper/Nix.t index efb073de..788ae685 100644 --- a/t/Helper/Nix.t +++ b/t/Helper/Nix.t @@ -24,6 +24,7 @@ root@ip x86_64-darwin /sshkey 15 15 big-parallel,kvm,nixos-test - base64key root@baz aarch64-darwin /sshkey 4 1 big-parallel root@bux i686-linux,x86_64-linux /var/sshkey 1 1 kvm,nixos-test benchmark +root@lotsofspace i686-linux,x86_64-linux /var/sshkey 1 1 kvm,nixos-test benchmark |; close $fh; @@ -53,6 +54,14 @@ is(Hydra::Helper::Nix::getMachines(), { 'supportedFeatures' => [ "kvm", "nixos-test", "benchmark" ], 'mandatoryFeatures' => [ "benchmark" ], }, + 'root@lotsofspace' => { + 'systemTypes' => [ "i686-linux", "x86_64-linux" ], + 'sshKeys' => '/var/sshkey', + 'maxJobs' => 1, + 'speedFactor' => 1, + 'supportedFeatures' => [ "kvm", "nixos-test", "benchmark" ], + 'mandatoryFeatures' => [ "benchmark" ], + }, }, ":)");