+2015-07-29  Pedro Alves  <palves@redhat.com>
+
+       * gdb.base/sizeof.exp (check_sizeof, check_valueof): Use
+       gdb_test_stdio.
+
 2015-07-29  Pedro Alves  <palves@redhat.com>
 
        * lib/gdb.exp (gdb_test_stdio): New procedure.
 
 proc check_sizeof { type size } {
     global gdb_prompt
 
-    set pat [string_to_regexp "sizeof (${type}) == ${size}"]
-    gdb_test "next" "${pat}\[\r\n\]+\[0-9\].*"  "check sizeof \"$type\""
+    set pat [string_to_regexp "sizeof (${type}) == ${size}\r\n"]
+    gdb_test_stdio "next" "${pat}" \
+       "\[0-9\].*" \
+       "check sizeof \"$type\""
 }
 
 check_sizeof "char" ${sizeof_char}
 proc check_valueof { exp val } {
     global gdb_prompt
 
-    set pat [string_to_regexp "valueof (${exp}) == ${val}"]
-    gdb_test "next" "${pat}\[\r\n\]+\[0-9\].*" "check valueof \"$exp\""
+    set pat [string_to_regexp "valueof (${exp}) == ${val}\r\n"]
+    gdb_test_stdio "next" "${pat}" \
+       "\[0-9\].*" \
+       "check valueof \"$exp\""
 }
 
 # Check that GDB and the target agree over the sign of a character.