Mercurial > octave
comparison libinterp/corefcn/pr-output.cc @ 26585:d673b506f382 stable
test: use "format short" in tests depending on output format (bug #55539)
* pr-output.cc: Apply "format short" on evalc tests assuming short output
display format, restore original output format.
* oct-parse.yy: Likewise.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Mon, 21 Jan 2019 13:27:28 -0800 |
parents | cfe28edab48b |
children | daa281e03d9a ecc16b72bfb3 |
comparison
equal
deleted
inserted
replaced
26581:ada14ef3067f | 26585:d673b506f382 |
---|---|
3385 return ovl (); | 3385 return ovl (); |
3386 } | 3386 } |
3387 | 3387 |
3388 /* | 3388 /* |
3389 %!test | 3389 %!test |
3390 %! str = evalc ("x = 1.1; display (x)"); | 3390 %! [old_fmt, old_spacing] = format (); |
3391 %! assert (str, "x = 1.1000\n"); | 3391 %! unwind_protect |
3392 %! format short; | |
3393 %! str = evalc ("x = 1.1; display (x)"); | |
3394 %! assert (str, "x = 1.1000\n"); | |
3395 %! unwind_protect_cleanup | |
3396 %! format (old_fmt); | |
3397 %! format (old_spacing); | |
3398 %! end_unwind_protect | |
3392 | 3399 |
3393 %!test | 3400 %!test |
3394 %! str = evalc ("display (1.1)"); | 3401 %! [old_fmt, old_spacing] = format (); |
3395 %! assert (str, " 1.1000\n"); | 3402 %! unwind_protect |
3403 %! format short; | |
3404 %! str = evalc ("display (1.1)"); | |
3405 %! assert (str, " 1.1000\n"); | |
3406 %! unwind_protect_cleanup | |
3407 %! format (old_fmt); | |
3408 %! format (old_spacing); | |
3409 %! end_unwind_protect | |
3396 | 3410 |
3397 ## Test input validation | 3411 ## Test input validation |
3398 %!error display () | 3412 %!error display () |
3399 %!error display (1,2) | 3413 %!error display (1,2) |
3400 */ | 3414 */ |