diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-09-02 07:52:36 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-09-02 07:52:36 +0000 |
| commit | b1aa227cbdca8c7c17e622c8cdf89949e06e66f4 (patch) | |
| tree | d31c13c0450e36ba1f53c6e6f6bd63b85f6b69d0 /lib | |
| parent | 37134cf3af96ac132fa610570e10a68c16f7aeb1 (diff) | |
| download | nixlib-b1aa227cbdca8c7c17e622c8cdf89949e06e66f4.tar nixlib-b1aa227cbdca8c7c17e622c8cdf89949e06e66f4.tar.gz nixlib-b1aa227cbdca8c7c17e622c8cdf89949e06e66f4.tar.bz2 nixlib-b1aa227cbdca8c7c17e622c8cdf89949e06e66f4.tar.lz nixlib-b1aa227cbdca8c7c17e622c8cdf89949e06e66f4.tar.xz nixlib-b1aa227cbdca8c7c17e622c8cdf89949e06e66f4.tar.zst nixlib-b1aa227cbdca8c7c17e622c8cdf89949e06e66f4.zip | |
* Use -no-reboot, otherwise kernel panics cause QEMU to get into an
infinite loop trying to start the machine. svn path=/nixos/trunk/; revision=16922
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/build-vms.nix | 2 | ||||
| -rw-r--r-- | lib/test-driver/Machine.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/build-vms.nix b/lib/build-vms.nix index ceb38b4b5cf7..939c1ecc51c2 100644 --- a/lib/build-vms.nix +++ b/lib/build-vms.nix @@ -130,7 +130,6 @@ rec { mkdir $out cp ${./test-driver/Machine.pm} Machine.pm ${perl}/bin/perl ${./test-driver/test-driver.pl} ${network}/vms/*/bin/run-*-vm - find . for i in */coverage-data; do ensureDir $out/coverage-data mv $i $out/coverage-data/$(dirname $i) @@ -175,6 +174,7 @@ rec { echo "making report..." ensureDir $out/coverage ${pkgs.lcov}/bin/genhtml --show-details $TMPDIR/full.info -o $out/coverage + cp $TMPDIR/full.info $out/coverage/ ensureDir $out/nix-support echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm index 65797604735e..0573293c2afb 100644 --- a/lib/test-driver/Machine.pm +++ b/lib/test-driver/Machine.pm @@ -71,7 +71,7 @@ sub start { dup2(fileno(LOG), fileno(STDOUT)); dup2(fileno(LOG), fileno(STDERR)); $ENV{TMPDIR} = $self->{stateDir}; - $ENV{QEMU_OPTS} = "-nographic -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr"; + $ENV{QEMU_OPTS} = "-nographic -no-reboot -redir tcp:65535::514 -net nic,vlan=1 -net socket,vlan=1,mcast=$mcastAddr"; $ENV{QEMU_KERNEL_PARAMS} = "console=ttyS0 panic=1 hostTmpDir=$ENV{TMPDIR}"; chdir $self->{stateDir} or die; exec $self->{script}; |