Revert "Show suppression counts. (Not yet per-test.)"

Revert "Show suppression counts.  (Not yet per-test.)"

This reverts commit r25825, 12ccd8bcd7b19a818d47f983f617539232cfc20f.

TBR=dkegel

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=25827

[kuchhal, 2009-09-10 00:58:50]

I think this change was causing the error below so I am going to try reverting
it.

18:07:39 common.py [INFO] collecting result code
Traceback (most recent call last):
  File
"/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/../../../src/tools/valgrind/chrome_tests.py",
line 425, in <module>
    ret = _main(sys.argv)
  File
"/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/../../../src/tools/valgrind/chrome_tests.py",
line 419, in _main
    ret = tests.Run()
  File
"/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/../../../src/tools/valgrind/chrome_tests.py",
line 178, in Run
    return self._test_list[self._test]()
  File
"/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/../../../src/tools/valgrind/chrome_tests.py",
line 229, in TestBase
    return self.SimpleTest("base", "base_unittests")
  File
"/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/../../../src/tools/valgrind/chrome_tests.py",
line 226, in SimpleTest
    return valgrind_test.RunTool(cmd)
  File
"/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/valgrind_test.py",
line 444, in RunTool
    return tool.Main(args)
  File
"/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/valgrind_test.py",
line 313, in Main
    retcode = self.RunTestsAndAnalyze()
  File
"/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/valgrind_test.py",
line 284, in RunTestsAndAnalyze
    retcode = self.Analyze()
  File
"/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/valgrind_test.py",
line 367, in Analyze
    use_gdb=use_gdb)
  File
"/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/memcheck_analyze.py",
line 467, in __init__
    suppcountlist = parsed_file.getElementsByTagName("suppcounts")[0]
IndexError: list index out of range

http://build.chromium.org/buildbot/waterfall/builders/Modules%20Linux%20(valg...

[not_the_right_dank, 2009-09-10 01:16:28]

Thanks... sorry for missing that.

On Wed, Sep 9, 2009 at 5:58 PM, <kuchhal@chromium.org> wrote:
>
> Reviewers: dkegel_google.com,
>
> Message:
> I think this change was causing the error below so I am going to try
> reverting
> it.
>
> 18:07:39 common.py [INFO] collecting result code
> Traceback (most recent call last):
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/..=
/../../src/tools/valgrind/chrome_tests.py",
> line 425, in <module>
> =A0 =A0ret =3D _main(sys.argv)
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/..=
/../../src/tools/valgrind/chrome_tests.py",
> line 419, in _main
> =A0 =A0ret =3D tests.Run()
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/..=
/../../src/tools/valgrind/chrome_tests.py",
> line 178, in Run
> =A0 =A0return self._test_list[self._test]()
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/..=
/../../src/tools/valgrind/chrome_tests.py",
> line 229, in TestBase
> =A0 =A0return self.SimpleTest("base", "base_unittests")
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/build/../sconsbuild/Release/..=
/../../src/tools/valgrind/chrome_tests.py",
> line 226, in SimpleTest
> =A0 =A0return valgrind_test.RunTool(cmd)
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/valgrind_test.p=
y",
> line 444, in RunTool
> =A0 =A0return tool.Main(args)
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/valgrind_test.p=
y",
> line 313, in Main
> =A0 =A0retcode =3D self.RunTestsAndAnalyze()
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/valgrind_test.p=
y",
> line 284, in RunTestsAndAnalyze
> =A0 =A0retcode =3D self.Analyze()
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/valgrind_test.p=
y",
> line 367, in Analyze
> =A0 =A0use_gdb=3Duse_gdb)
> =A0File
> "/b/slave/sub-rel-linux-valgrind/build/src/tools/valgrind/memcheck_analyz=
e.py",
> line 467, in __init__
> =A0 =A0suppcountlist =3D parsed_file.getElementsByTagName("suppcounts")[0=
]
> IndexError: list index out of range
>
> http://build.chromium.org/buildbot/waterfall/builders/Modules%20Linux%20(=
valgrind)/builds/717/steps/valgrind%20test:%20base/logs/stdio
>
> Description:
> Revert "Show suppression counts. =A0(Not yet per-test.)"
>
> This reverts commit r25825, 12ccd8bcd7b19a818d47f983f617539232cfc20f.
>
> TBR=3Ddkegel
>
> Please review this at http://codereview.chromium.org/202037
>
> Affected files:
> =A0M tools/valgrind/memcheck_analyze.py
>
>
> Index: tools/valgrind/memcheck_analyze.py
> diff --git a/tools/valgrind/memcheck_analyze.py
> b/tools/valgrind/memcheck_analyze.py
> index
> 0e8b8da348a5aa180cfad56de7c4805004eeacf7..61f9b4d0aaf739a25632e5b4e838b41=
f672f1fea
> 100755
> --- a/tools/valgrind/memcheck_analyze.py
> +++ b/tools/valgrind/memcheck_analyze.py
> @@ -248,6 +248,12 @@ class ValgrindError:
> =A0 =A0 # =A0</frame>
> =A0 =A0 # although the dir, file, and line elements are missing if there =
is
> =A0 =A0 # no debug info.
> + =A0 =A0#
> + =A0 =A0# With our patch for https://bugs.kde.org/show_bug.cgi?id=3D2050=
00 in,
> + =A0 =A0# the file also includes records of the form
> + =A0 =A0#
> <load_obj><obj>/usr/lib/libgcc_s.1.dylib</obj><ip>0x27000</ip></load_obj>
> + =A0 =A0# giving the filename and load address of each binary that was m=
apped
> + =A0 =A0# into the process.
>
> =A0 =A0 self._kind =3D getTextOf(error_node, "kind")
> =A0 =A0 self._backtraces =3D []
> @@ -372,31 +378,10 @@ class MemcheckAnalyze:
> =A0 =A0 =A0 show_all_leaks: whether to show even less important leaks
> =A0 =A0 '''
>
> - =A0 =A0# Beyond the detailed errors parsed by ValgrindError above,
> - =A0 =A0# the xml file contain records describing suppressions that were=
 used:
> - =A0 =A0# <suppcounts>
> - =A0 =A0# =A0<pair>
> - =A0 =A0# =A0 =A0<count>28</count>
> - =A0 =A0# =A0 =A0<name>pango_font_leak_todo</name>
> - =A0 =A0# =A0</pair>
> - =A0 =A0# =A0<pair>
> - =A0 =A0# =A0 =A0<count>378</count>
> - =A0 =A0# =A0 =A0<name>bug_13243</name>
> - =A0 =A0# =A0</pair>
> - =A0 =A0# </suppcounts
> - =A0 =A0# Collect these and print them at the end.
> - =A0 =A0#
> - =A0 =A0# With our patch for https://bugs.kde.org/show_bug.cgi?id=3D2050=
00 in,
> - =A0 =A0# the file also includes records of the form
> - =A0 =A0#
> <load_obj><obj>/usr/lib/libgcc_s.1.dylib</obj><ip>0x27000</ip></load_obj>
> - =A0 =A0# giving the filename and load address of each binary that was m=
apped
> - =A0 =A0# into the process.
> -
> =A0 =A0 global TheAddressTable
> =A0 =A0 if use_gdb:
> =A0 =A0 =A0 TheAddressTable =3D _AddressTable()
> =A0 =A0 self._errors =3D set()
> - =A0 =A0self._suppcounts =3D {}
> =A0 =A0 badfiles =3D set()
> =A0 =A0 start =3D time.time()
> =A0 =A0 self._parse_failed =3D False
> @@ -464,15 +449,6 @@ class MemcheckAnalyze:
> =A0 =A0 =A0 =A0 =A0 =A0 error =3D ValgrindError(source_dir, raw_error, co=
mmandline)
> =A0 =A0 =A0 =A0 =A0 =A0 self._errors.add(error)
>
> - =A0 =A0 =A0 =A0suppcountlist =3D parsed_file.getElementsByTagName("supp=
counts")[0]
> - =A0 =A0 =A0 =A0for node in suppcountlist.getElementsByTagName("pair"):
> - =A0 =A0 =A0 =A0 =A0count =3D getTextOf(node, "count");
> - =A0 =A0 =A0 =A0 =A0name =3D getTextOf(node, "name");
> - =A0 =A0 =A0 =A0 =A0if name in self._suppcounts:
> - =A0 =A0 =A0 =A0 =A0 =A0self._suppcounts[name] +=3D int(count)
> - =A0 =A0 =A0 =A0 =A0else:
> - =A0 =A0 =A0 =A0 =A0 =A0self._suppcounts[name] =3D int(count)
> -
> =A0 =A0 if len(badfiles) > 0:
> =A0 =A0 =A0 logging.warn("valgrind didn't finish writing %d files?!" %
> len(badfiles))
> =A0 =A0 =A0 for file in badfiles:
> @@ -484,13 +460,6 @@ class MemcheckAnalyze:
> =A0 =A0 =A0 logging.error("FAIL! Couldn't parse Valgrind output file")
> =A0 =A0 =A0 return -2
>
> - =A0 =A0print "-----------------------------------------------------"
> - =A0 =A0print "Suppressions used:"
> - =A0 =A0print " =A0count name"
> - =A0 =A0for item in sorted(self._suppcounts.items(), key=3Dlambda (k,v):=
 (v,k)):
> - =A0 =A0 =A0print "%7s %s" % (item[1], item[0])
> - =A0 =A0print "-----------------------------------------------------"
> -
> =A0 =A0 if self._errors:
> =A0 =A0 =A0 logging.error("FAIL! There were %s errors: " % len(self._erro=
rs))
>
>
>
>