X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Fautotest_test_funcs.py;h=0f012f6b75db144da775c3a52c0c21c144671935;hb=43a942393d1795fa303b490a81bd943970fe9a71;hp=414a190a21078904522416f51a009e51f91ffdbd;hpb=97d3fc918898dc042c0eb8dcafd684dc5806d56b;p=dpdk.git diff --git a/app/test/autotest_test_funcs.py b/app/test/autotest_test_funcs.py index 414a190a21..0f012f6b75 100644 --- a/app/test/autotest_test_funcs.py +++ b/app/test/autotest_test_funcs.py @@ -1,14 +1,14 @@ #!/usr/bin/python # 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 # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -18,7 +18,7 @@ # * Neither the name of Intel Corporation nor the names of its # contributors may be used to endorse or promote products derived # from this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -59,7 +59,7 @@ def dump_autotest(child, test_name): # 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]" @@ -295,4 +295,3 @@ def ring_autotest(child, test_name): return -1, "Fail [Bad watermark]" return 0, "Success" -