diff options
author | Jose <jose@zeroc.com> | 2015-08-28 21:47:33 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2015-08-28 21:47:33 +0200 |
commit | 9d2ec23e1d0062ef4cadc61cf974d592b050bc96 (patch) | |
tree | 25e34dccd502ee67978293257a7476827c1fc537 /scripts/TestUtil.py | |
parent | ICE-6744 - updating test to use better ciphers with anon-DH (diff) | |
download | ice-9d2ec23e1d0062ef4cadc61cf974d592b050bc96.tar.bz2 ice-9d2ec23e1d0062ef4cadc61cf974d592b050bc96.tar.xz ice-9d2ec23e1d0062ef4cadc61cf974d592b050bc96.zip |
Use fewer rounds for icehashpassword in Linux/ARM
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-x | scripts/TestUtil.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index bef52aaff57..2f26e05163b 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -846,10 +846,17 @@ def hashPasswords(filePath, entries): if os.path.exists(filePath): os.remove(filePath) passwords = open(filePath, "a") + + command = "%s %s" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py"))) + + # + # For Linux ARM default rounds makes test slower (Usually runs on embbeded boards) + # + if isLinux() and armv7l: + command += " --rounds 100000" + for user, password in entries.items(): - p = subprocess.Popen( - "%s %s" % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py"))), - shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE) + p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE) p.stdin.write(password.encode('UTF-8')) p.stdin.write('\r\n'.encode('UTF-8')) p.stdin.flush() |