diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-22 10:41:11 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-22 10:41:11 +0000 |
| commit | 158a60465f3487bf38f728a2678aa45acb568ad2 (patch) | |
| tree | e1201080f50c43300a2b4af801cec61b1ccac873 /lib | |
| parent | 228004604def36693da76b1ed69aa9f5b95820d3 (diff) | |
| download | nixlib-158a60465f3487bf38f728a2678aa45acb568ad2.tar nixlib-158a60465f3487bf38f728a2678aa45acb568ad2.tar.gz nixlib-158a60465f3487bf38f728a2678aa45acb568ad2.tar.bz2 nixlib-158a60465f3487bf38f728a2678aa45acb568ad2.tar.lz nixlib-158a60465f3487bf38f728a2678aa45acb568ad2.tar.xz nixlib-158a60465f3487bf38f728a2678aa45acb568ad2.tar.zst nixlib-158a60465f3487bf38f728a2678aa45acb568ad2.zip | |
* The vde_switch startup code was reading from the wrong filehandle,
so the startup synchronisation didn't work, causing spurious QEMU
failures ("Device 'vde' could not be initialized").
svn path=/nixos/trunk/; revision=26055
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test-driver/test-driver.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl index bdb3f40ca6cb..547f1da1af72 100644 --- a/lib/test-driver/test-driver.pl +++ b/lib/test-driver/test-driver.pl @@ -38,9 +38,10 @@ foreach my $vlan (split / /, $ENV{VLANS} || "") { } close $stdoutW; print $pty "version\n"; - readline $pty or die "cannot start vde_switch"; + readline $stdoutR or die "cannot start vde_switch"; $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket; $vlans{$vlan} = $pty; + die unless -e "$socket/ctl"; } |