From 0c8ee891a75dfdc1c3420e36389d6ea7c680d1fb Mon Sep 17 00:00:00 2001 From: Aaron Smith Date: Thu, 12 Apr 2018 23:45:15 +0000 Subject: [PATCH] [lit] Remove duplicate to_string method There are two versions of to_string used by TestRunner.py. The one defined in TestRunner.py and the one defined in utils/lit/lit/util.py. The util.py version is superior to the TestRunner.py version. This change removes the duplicate to_string in TestRunner.py in favor of always using the version from util.py. Beside removing duplicate code, this makes it easier to debug TestRunner.py since only one version of to_string is used. Patch by Stella Stamenova! llvm-svn: 329972 --- llvm/utils/lit/lit/TestRunner.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py index bfd1596..a6f9276 100644 --- a/llvm/utils/lit/lit/TestRunner.py +++ b/llvm/utils/lit/lit/TestRunner.py @@ -922,11 +922,6 @@ def _executeShCmd(cmd, shenv, results, timeoutHelper): f.seek(0, 0) procData[i] = (procData[i][0], f.read()) - def to_string(bytes): - if isinstance(bytes, str): - return bytes - return bytes.encode('utf-8') - exitCode = None for i,(out,err) in enumerate(procData): res = procs[i].wait() -- 2.7.4