aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-14 22:42:29 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-14 22:42:29 +0000
commit2a82441b16960189395c056dbe60394c77738f89 (patch)
tree2ebd5b9428177edcb6e928d6945f57ea60b28398
parente9985459eb8af4c765cbe3a9b7a63ffafbf3d8ef (diff)
downloadglibc-2a82441b16960189395c056dbe60394c77738f89.tar
glibc-2a82441b16960189395c056dbe60394c77738f89.tar.gz
glibc-2a82441b16960189395c056dbe60394c77738f89.tar.bz2
glibc-2a82441b16960189395c056dbe60394c77738f89.zip
Update.
* stdio-common/tst-printf.sh: Also allow output from 64-bit machines.
-rw-r--r--ChangeLog2
-rw-r--r--stdio-common/tst-printf.sh115
2 files changed, 116 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e4ecb2066..67cca5364a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2000-09-14 Ulrich Drepper <drepper@redhat.com>
+ * stdio-common/tst-printf.sh: Also allow output from 64-bit machines.
+
* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): Change
to not use sysctl(). Too many architectures have problems with it.
diff --git a/stdio-common/tst-printf.sh b/stdio-common/tst-printf.sh
index dbf15d436c..e6e3327a17 100644
--- a/stdio-common/tst-printf.sh
+++ b/stdio-common/tst-printf.sh
@@ -136,6 +136,119 @@ Test ok.
sprintf (buf, "%07Lo", 040000000000ll) = 40000000000
--- Should be no further output. ---
EOF
-cmp - ${common_objpfx}stdio-common/tst-printf.out || status=1
+cmp - ${common_objpfx}stdio-common/tst-printf.out >& /dev/null ||
+cat <<'EOF' |
+%.4x: `0012'
+%04x: `0012'
+%4.4x: `0012'
+%04.4x: `0012'
+%4.3x: ` 012'
+%04.3x: ` 012'
+%.*x: `0012'
+%0*x: `0012'
+%*.*x: `0012'
+%0*.*x: `0012'
+bad format: "%b"
+nil pointer (padded): " (nil)"
+decimal negative: "-2345"
+octal negative: "37777773327"
+hex negative: "fffff6d7"
+long decimal number: "-123456"
+long octal negative: "1777777777777777773327"
+long unsigned decimal number: "18446744073709428160"
+zero-padded LDN: "-000123456"
+left-adjusted ZLDN: "-123456 "
+space-padded LDN: " -123456"
+left-adjusted SLDN: "-123456 "
+zero-padded string: " Hi, Z."
+left-adjusted Z string: "Hi, Z. "
+space-padded string: " Hi, Z."
+left-adjusted S string: "Hi, Z. "
+null string: "(null)"
+limited string: "Good morning, Doctor C"
+e-style >= 1: "1.234000e+01"
+e-style >= .1: "1.234000e-01"
+e-style < .1: "1.234000e-03"
+e-style big: "1.000000000000000000000000000000000000000000000000000000000000e+20"
+e-style == .1: "1.000000e-01"
+f-style >= 1: "12.340000"
+f-style >= .1: "0.123400"
+f-style < .1: "0.001234"
+g-style >= 1: "12.34"
+g-style >= .1: "0.1234"
+g-style < .1: "0.001234"
+g-style big: "100000000000000000000"
+ 0.10000
+ 0.10000
+x0.5000x
+0x1
+something really insane: 1.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+5.87747175411143754e-39
+ 4.94066e-324
+| 0.0000| 0.0000e+00| 0|
+| 1.0000| 1.0000e+00| 1|
+| -1.0000| -1.0000e+00| -1|
+| 100.0000| 1.0000e+02| 100|
+| 1000.0000| 1.0000e+03| 1000|
+| 10000.0000| 1.0000e+04| 1e+04|
+| 12345.0000| 1.2345e+04| 1.234e+04|
+| 100000.0000| 1.0000e+05| 1e+05|
+| 123456.0000| 1.2346e+05| 1.235e+05|
+snprintf ("%30s", "foo") == 30, " "
+snprintf ("%.999999u", 10)
+
+Formatted output test
+prefix 6d 6o 6x 6X 6u
+%-+#0 |-123 |0377 |0xff |0XFF |4294967295 |
+ %-+# |-123 |0377 |0xff |0XFF |4294967295 |
+ %-+0 |-123 |377 |ff |FF |4294967295 |
+ %-+ |-123 |377 |ff |FF |4294967295 |
+ %-#0 |-123 |0377 |0xff |0XFF |4294967295 |
+ %-# |-123 |0377 |0xff |0XFF |4294967295 |
+ %-0 |-123 |377 |ff |FF |4294967295 |
+ %- |-123 |377 |ff |FF |4294967295 |
+ %+#0 |-00123 |000377 |0x00ff |0X00FF |4294967295 |
+ %+# | -123 | 0377 | 0xff | 0XFF |4294967295 |
+ %+0 |-00123 |000377 |0000ff |0000FF |4294967295 |
+ %+ | -123 | 377 | ff | FF |4294967295 |
+ %#0 |-00123 |000377 |0x00ff |0X00FF |4294967295 |
+ %# | -123 | 0377 | 0xff | 0XFF |4294967295 |
+ %0 |-00123 |000377 |0000ff |0000FF |4294967295 |
+ % | -123 | 377 | ff | FF |4294967295 |
+ (null)
+(null)
+1.234568e+06 should be 1.234568e+06
+1234567.800000 should be 1234567.800000
+1.23457e+06 should be 1.23457e+06
+123.456 should be 123.456
+1e+06 should be 1e+06
+10 should be 10
+0.02 should be 0.02
+0.10000000000000009
+Test ok.
+sprintf (buf, "%07Lo", 040000000000ll) = 40000000000
+--- Should be no further output. ---
+EOF
+cmp - ${common_objpfx}stdio-common/tst-printf.out >& /dev/null ||
+{
+ status=1
+ echo "*** output comparison failed"
+}
exit $status