Skip to content

Commit b70ff3d

Browse files
committed
Allow skipping network tests in all qemu scripts
Fixes: da448e2 ("Make it possible to skip the qemu network tests")
1 parent 9639cc1 commit b70ff3d

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

scripts/boot/qemu-44x

+4-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ def main():
5050
p.expect("PowerPC 44x Platform")
5151
p.expect_prompt()
5252

53-
qemu_net_setup(p)
54-
ping_test(p, check=False)
55-
wget_test(p)
53+
if os.environ.get('QEMU_NET_TESTS', True) != '0':
54+
qemu_net_setup(p)
55+
ping_test(p, check=False)
56+
wget_test(p)
5657

5758
p.send('echo o > /proc/sysrq-trigger')
5859
p.expect('System Halted, OK to turn off power')

scripts/boot/qemu-g5

+4-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ def main():
5555
p.expect("PowerMac3,1 MacRISC MacRISC2 Power Macintosh")
5656
p.expect_prompt()
5757

58-
qemu_net_setup(p)
59-
ping_test(p)
60-
wget_test(p)
58+
if os.environ.get('QEMU_NET_TESTS', True) != '0':
59+
qemu_net_setup(p)
60+
ping_test(p)
61+
wget_test(p)
6162

6263
p.send("halt")
6364
p.expect("reboot: System halted")

scripts/boot/qemu-mac99

+4-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ def main():
5656
p.expect('PowerMac3,1 MacRISC MacRISC2 Power Macintosh')
5757
p.expect_prompt()
5858

59-
qemu_net_setup(p)
60-
ping_test(p)
61-
wget_test(p)
59+
if os.environ.get('QEMU_NET_TESTS', True) != '0':
60+
qemu_net_setup(p)
61+
ping_test(p)
62+
wget_test(p)
6263

6364
p.send('halt')
6465
p.wait_for_exit()

scripts/boot/qemu-ppc64e

+4-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,10 @@ def main():
6565
p.expect("QEMU ppce500")
6666
p.expect_prompt()
6767

68-
qemu_net_setup(p)
69-
ping_test(p, check=False)
70-
wget_test(p)
68+
if os.environ.get('QEMU_NET_TESTS', True) != '0':
69+
qemu_net_setup(p)
70+
ping_test(p, check=False)
71+
wget_test(p)
7172

7273
p.send("echo o > /proc/sysrq-trigger")
7374
p.wait_for_exit()

0 commit comments

Comments
 (0)