diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-02-14 20:59:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-02-14 20:59:37 (GMT) |
| commit | f9a0feeb4b3b8610f7a733cf15e608f6815e163f (patch) | |
| tree | 7bb22c59ba9e6f7149c0c7834753413c293e8b86 | |
| parent | fcfee868a9f98005d8e3f7f964dfb6d9ba1e53b9 (diff) | |
| download | tcl-f9a0feeb4b3b8610f7a733cf15e608f6815e163f.zip tcl-f9a0feeb4b3b8610f7a733cf15e608f6815e163f.tar.gz tcl-f9a0feeb4b3b8610f7a733cf15e608f6815e163f.tar.bz2 | |
fix test-cases, account for differences between Tcl 8.7 and 9.0
| -rw-r--r-- | generic/tclStringObj.c | 8 | ||||
| -rw-r--r-- | tests/format.test | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 5430d02..b196593 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -2030,14 +2030,6 @@ Tcl_AppendFormatToObj( Tcl_AppendToObj(segment, "0b", 2); segmentLimit -= 2; break; -#if TCL_MAJOR_VERSION < 9 - case 'd': - if (gotZero) { - Tcl_AppendToObj(segment, "0d", 2); - segmentLimit -= 2; - } - break; -#endif } } diff --git a/tests/format.test b/tests/format.test index ed8676a..d380b05 100644 --- a/tests/format.test +++ b/tests/format.test @@ -81,13 +81,13 @@ test format-1.12 {integer formatting} { } {101 0 0b101 10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000} test format-1.13 {integer formatting} { format "%#0d %#0d %#0d %#0d %#0d" 0 6 34 16923 -12 -1 -} {0 0d6 0d34 0d16923 -0d12} +} {0 6 34 16923 -12} test format-1.14 {integer formatting} { format "%#05d %#020d %#020d %#020d %#020d" 0 6 34 16923 -12 -1 -} {00000 0d000000000000000006 0d000000000000000034 0d000000000000016923 -0d00000000000000012} +} {00000 00000000000000000006 00000000000000000034 00000000000000016923 -0000000000000000012} test format-1.15 {integer formatting} { format "%-#05d %-#020d %-#020d %-#020d %-#020d" 0 6 34 16923 -12 -1 -} {00000 0d000000000000000006 0d000000000000000034 0d000000000000016923 -0d00000000000000012} +} {00000 00000000000000000006 00000000000000000034 00000000000000016923 -0000000000000000012} test format-2.1 {string formatting} { |