[libcxx-commits] [libcxx] r373570 - Fix libc++ pretty printer test for Python 3 after D67238 (take 2)

[David Zarzycki via libcxx-commits]

Still doesn’t work. Maybe we should revert r373452

> On Oct 3, 2019, at 9:19 AM, Fangrui Song via libcxx-commits <libcxx-commits at lists.llvm.org> wrote:
> 
> Author: maskray
> Date: Wed Oct  2 23:19:50 2019
> New Revision: 373570
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=373570&view=rev
> Log:
> Fix libc++ pretty printer test for Python 3 after D67238 (take 2)
> 
> In both Python 2 and Python 3, gdb.Value.string returns a 'str'. We just
> need to delete a `encode("utf-8")` which would return a 'bytes' in
> Python 3.
> 
> Modified:
>    libcxx/trunk/test/pretty_printers/gdb_pretty_printer_test.py
> 
> Modified: libcxx/trunk/test/pretty_printers/gdb_pretty_printer_test.py
> URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/pretty_printers/gdb_pretty_printer_test.py?rev=373570&r1=373569&r2=373570&view=diff
> ==============================================================================
> --- libcxx/trunk/test/pretty_printers/gdb_pretty_printer_test.py (original)
> +++ libcxx/trunk/test/pretty_printers/gdb_pretty_printer_test.py Wed Oct  2 23:19:50 2019
> @@ -46,12 +46,10 @@ class CheckResult(gdb.Command):
>             gdb.newest_frame().select()
> 
>             expectation_val = compare_frame.read_var("expectation")
> +            check_literal = expectation_val.string(encoding="utf-8")
>             if "PrettyPrintToRegex" in compare_frame.name():
> -                check_literal = expectation_val.string()
>                 test_fails = not re.match(check_literal, value)
>             else:
> -                check_literal_string = expectation_val.string(encoding="utf-8")
> -                check_literal = str(check_literal_string.encode("utf-8"))
>                 test_fails = value != check_literal
> 
>             if test_fails:
> 
> 
> _______________________________________________
> libcxx-commits mailing list
> libcxx-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/libcxx-commits