diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-02 13:44:16 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-02 13:44:16 -0400 |
| commit | d4fec178fdddc8749c6b105a16f5fb9a6d9bfe89 (patch) | |
| tree | 7a83c031934eba83aec01f05e7d36df1d08ac422 /lib | |
| parent | e4ed2120fd90b138d67f5f5306a7deb020557307 (diff) | |
| parent | 1fcef0a0e0c44f0b01256964f08964986953cbf4 (diff) | |
| download | nixlib-d4fec178fdddc8749c6b105a16f5fb9a6d9bfe89.tar nixlib-d4fec178fdddc8749c6b105a16f5fb9a6d9bfe89.tar.gz nixlib-d4fec178fdddc8749c6b105a16f5fb9a6d9bfe89.tar.bz2 nixlib-d4fec178fdddc8749c6b105a16f5fb9a6d9bfe89.tar.lz nixlib-d4fec178fdddc8749c6b105a16f5fb9a6d9bfe89.tar.xz nixlib-d4fec178fdddc8749c6b105a16f5fb9a6d9bfe89.tar.zst nixlib-d4fec178fdddc8749c6b105a16f5fb9a6d9bfe89.zip | |
Merge remote-tracking branch 'origin/master' into systemd
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test-driver/Machine.pm | 3 | ||||
| -rw-r--r-- | lib/test-driver/test-driver.pl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm index f0d5fbc19ead..c501aa5f1ed5 100644 --- a/lib/test-driver/Machine.pm +++ b/lib/test-driver/Machine.pm @@ -29,7 +29,8 @@ sub new { $startCommand = "qemu-kvm -m 384 " . "-net nic,model=virtio \$QEMU_OPTS "; - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=virtio,boot=on,werror=report " + my $iface = $args->{hdaInterface} || "virtio"; + $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report " if defined $args->{hda}; $startCommand .= "-cdrom $args->{cdrom} " if defined $args->{cdrom}; diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl index fc4b7ea05551..c6a707cdf6b9 100644 --- a/lib/test-driver/test-driver.pl +++ b/lib/test-driver/test-driver.pl @@ -135,7 +135,7 @@ sub runTests { # Figure out where to put the *.gcda files so that the # report generator can find the corresponding kernel # sources. - my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*"); + my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /run/current-system/kernel))/.build/linux-*"); chomp $kernelDir; my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir"; |