# BSD LICENSE
#
-# Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+# Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# reads output and waits for Test OK
def memory_autotest(child, test_name):
child.sendline(test_name)
- regexp = "phys:0x[0-9a-f]*, len:0x([0-9a-f]*), virt:0x[0-9a-f]*, socket_id:[0-9]*"
+ regexp = "phys:0x[0-9a-f]*, len:([0-9]*), virt:0x[0-9a-f]*, socket_id:[0-9]*"
index = child.expect([regexp, pexpect.TIMEOUT], timeout = 180)
if index != 0:
return -1, "Fail [Timeout]"
elif index == 2:
return -1, "Fail [Timeout]"
- index = child.expect(["Start timer basic tests \(20 seconds\)",
+ index = child.expect(["Start timer stress tests 2",
"Test Failed",
pexpect.TIMEOUT], timeout = 40)
elif index == 2:
return -1, "Fail [Timeout]"
+ index = child.expect(["Start timer basic tests \(20 seconds\)",
+ "Test Failed",
+ pexpect.TIMEOUT], timeout = 20)
+
+ if index == 1:
+ return -1, "Fail"
+ elif index == 2:
+ return -1, "Fail [Timeout]"
+
prev_lcore_timer1 = -1
lcore_tim0 = -1