From 7e42338dc5e67a85821831b4f34bfb6f52c157d3 Mon Sep 17 00:00:00 2001 From: Kelvin Ly Date: Mon, 5 Jan 2015 13:49:33 -0500 Subject: Added two tests for pretty printing optimized enums --- src/test/debuginfo/gdb-pretty-struct-and-enums.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/test/debuginfo') diff --git a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs b/src/test/debuginfo/gdb-pretty-struct-and-enums.rs index 64c120e1ab3..9b791fe1275 100644 --- a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs +++ b/src/test/debuginfo/gdb-pretty-struct-and-enums.rs @@ -69,6 +69,13 @@ // gdb-command: print nested_variant2 // gdb-check:$16 = NestedVariant2 = {abc = NestedStruct = {regular_struct = RegularStruct = {the_first_field = 117, the_second_field = 118.5, the_third_field = false, the_fourth_field = "NestedStructString10"}, tuple_struct = TupleStruct = {119.5, 120}, empty_struct = EmptyStruct, c_style_enum = CStyleEnumVar3, mixed_enum = MixedEnumStructVar = {field1 = 121.5, field2 = -122}}} +// gdb-command: print none_check1 +// gdb-check:$16 = None + +// gdb-command: print none_check2 +// gdb-check:$17 = None + +use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3}; use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3}; use self::MixedEnum::{MixedEnumCStyleVar, MixedEnumTupleVar, MixedEnumStructVar}; use self::NestedEnum::{NestedVariant1, NestedVariant2}; @@ -170,6 +177,9 @@ fn main() { } }; + let none_check1: Option<(uint, Vec)> = None; + let none_check2: Option = None; + zzz(); // #break } -- cgit 1.4.1-3-g733a5 From 87eebd17cd994a1c847c4a8926663478c4670c40 Mon Sep 17 00:00:00 2001 From: Kelvin Ly Date: Mon, 5 Jan 2015 14:58:02 -0500 Subject: Fixed tests --- src/test/debuginfo/gdb-pretty-struct-and-enums.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/test/debuginfo') diff --git a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs b/src/test/debuginfo/gdb-pretty-struct-and-enums.rs index 9b791fe1275..4472e1e047d 100644 --- a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs +++ b/src/test/debuginfo/gdb-pretty-struct-and-enums.rs @@ -70,10 +70,10 @@ // gdb-check:$16 = NestedVariant2 = {abc = NestedStruct = {regular_struct = RegularStruct = {the_first_field = 117, the_second_field = 118.5, the_third_field = false, the_fourth_field = "NestedStructString10"}, tuple_struct = TupleStruct = {119.5, 120}, empty_struct = EmptyStruct, c_style_enum = CStyleEnumVar3, mixed_enum = MixedEnumStructVar = {field1 = 121.5, field2 = -122}}} // gdb-command: print none_check1 -// gdb-check:$16 = None +// gdb-check:$17 = None // gdb-command: print none_check2 -// gdb-check:$17 = None +// gdb-check:$18 = None use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3}; use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3}; -- cgit 1.4.1-3-g733a5 From d33857208f9af74fd414c79eeda40bdf50bf4574 Mon Sep 17 00:00:00 2001 From: Kelvin Ly Date: Mon, 5 Jan 2015 15:28:19 -0500 Subject: Fixed tests --- src/test/debuginfo/gdb-pretty-struct-and-enums.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'src/test/debuginfo') diff --git a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs b/src/test/debuginfo/gdb-pretty-struct-and-enums.rs index 4472e1e047d..4b2628b2a1f 100644 --- a/src/test/debuginfo/gdb-pretty-struct-and-enums.rs +++ b/src/test/debuginfo/gdb-pretty-struct-and-enums.rs @@ -75,7 +75,6 @@ // gdb-command: print none_check2 // gdb-check:$18 = None -use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3}; use self::CStyleEnum::{CStyleEnumVar1, CStyleEnumVar2, CStyleEnumVar3}; use self::MixedEnum::{MixedEnumCStyleVar, MixedEnumTupleVar, MixedEnumStructVar}; use self::NestedEnum::{NestedVariant1, NestedVariant2}; -- cgit 1.4.1-3-g733a5