From f3d9f7fb030962e935c80b1fddc2c95b367774b0 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Wed, 11 Nov 2009 20:01:24 +0000 Subject: [PATCH] * gdb.base/long_long.exp: Permit leading zeros on floating-point exponents. * gdb.base/pointers.exp: Likewise. * gdb.cp/ref-types.exp: Likewise. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.base/long_long.exp | 6 +++--- gdb/testsuite/gdb.base/pointers.exp | 4 ++-- gdb/testsuite/gdb.cp/ref-types.exp | 4 ++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 44a67f012b..29bdd9e570 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-11-11 Nathan Froyd + + * gdb.base/long_long.exp: Permit leading zeros on floating-point + exponents. + * gdb.base/pointers.exp: Likewise. + * gdb.cp/ref-types.exp: Likewise. + 2009-11-11 Keith Seitz * gdb.cp/cplusfuncs.cc (class foo): Add operators diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index e5e85393f7..ffbcadec6a 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -228,7 +228,7 @@ gdb_test_int "p/u *(int *)i" "" "291" "19088743" "" gdb_test_int "p/o *(int *)i" "" "0443" "0110642547" "" gdb_test_int "p/t *(int *)i" "" "100100011" "1001000110100010101100111" "" gdb_test_int "p/a *(int *)i" "" "" "0x1234567" "" -gdb_test_int "p/f *(int *)i" "" "291" "2.99881655e-38" "" +gdb_test_int "p/f *(int *)i" "" "291" "2.99881655e-0?38" "" gdb_test_int "p/c *(int *)i" "" "35 '.'" "103 'g'" "" gdb_test_long "p/x *(long *)l" "" "0x123" "0x1234567" "0x123456789abcdef" @@ -237,7 +237,7 @@ gdb_test_long "p/u *(long *)l" "" "291" "19088743" "81985529216486895" gdb_test_long "p/o *(long *)l" "" "0443" "0110642547" "04432126361152746757" gdb_test_long "p/t *(long *)l" "" "100100011" "1001000110100010101100111" "100100011010001010110011110001001101010111100110111101111" gdb_test_ptr "p/a *(long *)l" "" "" "0x1234567" "0x123456789abcdef" -gdb_test_long "p/f *(long *)l" "" "291" "2.99881655e-38" "3.5127005640885037e-303" +gdb_test_long "p/f *(long *)l" "" "291" "2.99881655e-0?38" "3.5127005640885037e-303" gdb_test_long "p/c *(long *)l" "" "35 '.'" "103 'g'" "-17 '.*'" gdb_test_long_long "p/x *(long long *)ll" "" "" "" "0x123456789abcdef" @@ -308,7 +308,7 @@ gdb_test "x/2wo w" "0110642547.*024713562471" gdb_test "x/2wt w" "00000001001000110100010101100111.*10100111001011101110010100111001" gdb_test_ptr "x/2wa w" "" "" "0x1234567.*0xa72ee539" "0x1234567.*0xffffffffa72ee539" gdb_test "x/2wc w" "103 'g'.*57 '9'" -gdb_test "x/2wf w" "2.99881655e-38.*-2.42716126e-15" +gdb_test "x/2wf w" "2.99881655e-0?38.*-2.42716126e-0?15" gdb_test "x/2gx g" "0x0123456789abcdef.*0xa72ee53977053977" gdb_test "x/2gd g" "81985529216486895.*-6399925985474168457" diff --git a/gdb/testsuite/gdb.base/pointers.exp b/gdb/testsuite/gdb.base/pointers.exp index 91838a2aea..b1c2d984e4 100644 --- a/gdb/testsuite/gdb.base/pointers.exp +++ b/gdb/testsuite/gdb.base/pointers.exp @@ -512,7 +512,7 @@ gdb_expect { send_gdb "print *pF\n" gdb_expect { - -re ".\[0-9\]* = 1.2\[0-9\]*e\\+10.*$gdb_prompt $" { + -re ".\[0-9\]* = 1.2\[0-9\]*e\\+0?10.*$gdb_prompt $" { pass "print value of *pF" } -re ".*$gdb_prompt $" { fail "print value of *pF" } @@ -529,7 +529,7 @@ gdb_expect { send_gdb "print *pD\n" gdb_expect { - -re ".\[0-9\]* = -1.2\[0-9\]*e\\-37.*$gdb_prompt $" { + -re ".\[0-9\]* = -1.2\[0-9\]*e\\-0?37.*$gdb_prompt $" { pass "print value of *pD" } -re ".*$gdb_prompt $" { fail "print value of *pD" } diff --git a/gdb/testsuite/gdb.cp/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp index 4784cb25d4..b2d5f5ab6f 100644 --- a/gdb/testsuite/gdb.cp/ref-types.exp +++ b/gdb/testsuite/gdb.cp/ref-types.exp @@ -412,7 +412,7 @@ gdb_expect { send_gdb "print F\n" gdb_expect { - -re ".\[0-9\]* = 1.2\[0-9\]*e\\+10.*$gdb_prompt $" { + -re ".\[0-9\]* = 1.2\[0-9\]*e\\+0?10.*$gdb_prompt $" { pass "print value of F" } -re ".*$gdb_prompt $" { fail "print value of F" } @@ -640,7 +640,7 @@ gdb_expect { send_gdb "print rF\n" gdb_expect { - -re ".\[0-9\]* = \\(float &\\) @$hex: 1.2\[0-9\]*e\\+10.*$gdb_prompt $" { + -re ".\[0-9\]* = \\(float &\\) @$hex: 1.2\[0-9\]*e\\+0?10.*$gdb_prompt $" { pass "print value of rF" } -re ".*$gdb_prompt $" { fail "print value of rF" }