diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-19 16:49:29 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-19 16:49:29 +0100 |
| commit | a31a2f082f26785967d8cb302ca940e76d513ac6 (patch) | |
| tree | 040b2c2772fd83e28d4bf56bb0ad5f5f2940decc /source4 | |
| parent | d3e182098a69a20035ee5eb0e9ab453dfdcb9c8b (diff) | |
| download | samba-a31a2f082f26785967d8cb302ca940e76d513ac6.tar.gz samba-a31a2f082f26785967d8cb302ca940e76d513ac6.tar.bz2 samba-a31a2f082f26785967d8cb302ca940e76d513ac6.zip | |
Allow connecting to screen.
(This used to be commit a021408c9d78260b9abf7ebec4230b7958033a38)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/selftest/config.mk | 4 | ||||
| -rw-r--r-- | source4/selftest/target/Kvm.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index 306a11469c..4e9d31b684 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -11,10 +11,10 @@ test:: everything $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS) kvmtest:: everything - $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --target=kvm --image=$(KVM_IMAGE) + $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate --target=kvm --image=$(KVM_IMAGE) kvmquicktest:: everything - $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --quick --target=kvm --image=$(KVM_IMAGE) + $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate --quick --target=kvm --image=$(KVM_IMAGE) testone:: everything $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --one $(TESTS) diff --git a/source4/selftest/target/Kvm.pm b/source4/selftest/target/Kvm.pm index 1037f23c59..7799cb7ec0 100644 --- a/source4/selftest/target/Kvm.pm +++ b/source4/selftest/target/Kvm.pm @@ -99,7 +99,7 @@ sub start($$$) my $pidfile = "$path/kvm.pid"; - my $opts = ($ENV{KVM_OPTIONS} or "-nographic"); + my $opts = (defined($ENV{KVM_OPTIONS})?$ENV{KVM_OPTIONS}:"-nographic"); my ($ifup_script, $dhcpd_pidfile, $ip_address) = $self->write_kvm_ifup($path, "192.168.9"); |