diff options
| author | rillig <rillig@NetBSD.org> | 2023-07-05 11:42:14 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2023-07-05 11:42:14 +0000 |
| commit | 00d31836f19a7d36e1ee546528bc6a5822270f1f (patch) | |
| tree | 43ce2253e67c1891f45bafd00d2e578b79e848a1 /tests | |
| parent | b09f23c8252f1dbf901d0f3e4f6c74395bca932e (diff) | |
tests/lint: spell platform identifiers for 'long double' consistently
The test file names don't have a hyphen, so the identifiers shouldn't
have one either.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/usr.bin/xlint/lint1/gen-platforms.sh | 4 | ||||
| -rw-r--r-- | tests/usr.bin/xlint/lint1/msg_247_ilp32_ldbl64.c | 6 | ||||
| -rw-r--r-- | tests/usr.bin/xlint/lint1/msg_247_lp64_ldbl128.c | 6 | ||||
| -rw-r--r-- | tests/usr.bin/xlint/lint1/msg_247_portable.c | 6 | ||||
| -rw-r--r-- | tests/usr.bin/xlint/lint1/platform_ldbl128.c | 4 | ||||
| -rw-r--r-- | tests/usr.bin/xlint/lint1/platform_ldbl64.c | 4 | ||||
| -rw-r--r-- | tests/usr.bin/xlint/lint1/platform_ldbl96.c | 4 | ||||
| -rw-r--r-- | tests/usr.bin/xlint/lint1/t_integration.sh | 48 |
8 files changed, 41 insertions, 41 deletions
diff --git a/tests/usr.bin/xlint/lint1/gen-platforms.sh b/tests/usr.bin/xlint/lint1/gen-platforms.sh index 470a8ffb04c..21afd75f2d9 100644 --- a/tests/usr.bin/xlint/lint1/gen-platforms.sh +++ b/tests/usr.bin/xlint/lint1/gen-platforms.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: gen-platforms.sh,v 1.1 2021/10/10 18:16:12 rillig Exp $ +# $NetBSD: gen-platforms.sh,v 1.2 2023/07/05 11:42:14 rillig Exp $ # # Copyright (c) 2021 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ for file in ../../../../usr.bin/xlint/arch/*/targparam.h; do char=$(sed -n -E 's,.*"([su]char)\.h".*,\1,p' "$file") ilp=$(sed -n -E 's,.*"(ilp32|lp64)\.h".*,\1,p' "$file") size=$(awk '/#.*LONG$/ { l = "long" } /#.*INT$/ { i = "int" } END { print(i "" l) }' "$file") - ldbl=$(sed -n -E 's,^#.*LDOUBLE[^0-9]+([0-9]+)$,ldbl-\1,p' "$file") + ldbl=$(sed -n -E 's,^#.*LDOUBLE[^0-9]+([0-9]+)$,ldbl\1,p' "$file") if [ "$size" != "int" ] && [ "$size" != "long" ]; then size="????" # mips diff --git a/tests/usr.bin/xlint/lint1/msg_247_ilp32_ldbl64.c b/tests/usr.bin/xlint/lint1/msg_247_ilp32_ldbl64.c index 53fbd47c43d..c5d5f445fc9 100644 --- a/tests/usr.bin/xlint/lint1/msg_247_ilp32_ldbl64.c +++ b/tests/usr.bin/xlint/lint1/msg_247_ilp32_ldbl64.c @@ -1,4 +1,4 @@ -/* $NetBSD: msg_247_ilp32_ldbl64.c,v 1.1 2023/07/05 11:36:56 rillig Exp $ */ +/* $NetBSD: msg_247_ilp32_ldbl64.c,v 1.2 2023/07/05 11:42:14 rillig Exp $ */ # 3 "msg_247_ilp32.c" // Test for message: pointer cast from '%s' to '%s' may be troublesome [247] @@ -6,10 +6,10 @@ // In non-portable mode, lint warns based on the actual type sizes. // // See also: -// msg_247_lp64.c +// msg_247_lp64_ldbl128.c // msg_247_portable.c -/* lint1-only-if: ilp32 ldbl-64 */ +/* lint1-only-if: ilp32 ldbl64 */ /* lint1-extra-flags: -c -X 351 */ typedef double double_array[5]; diff --git a/tests/usr.bin/xlint/lint1/msg_247_lp64_ldbl128.c b/tests/usr.bin/xlint/lint1/msg_247_lp64_ldbl128.c index d1c74881cfb..2c3bf3fb2bb 100644 --- a/tests/usr.bin/xlint/lint1/msg_247_lp64_ldbl128.c +++ b/tests/usr.bin/xlint/lint1/msg_247_lp64_ldbl128.c @@ -1,4 +1,4 @@ -/* $NetBSD: msg_247_lp64_ldbl128.c,v 1.1 2023/07/05 11:36:56 rillig Exp $ */ +/* $NetBSD: msg_247_lp64_ldbl128.c,v 1.2 2023/07/05 11:42:14 rillig Exp $ */ # 3 "msg_247_lp64.c" // Test for message: pointer cast from '%s' to '%s' may be troublesome [247] @@ -6,10 +6,10 @@ // In non-portable mode, lint warns based on the actual type sizes. // // See also: -// msg_247_ilp32.c +// msg_247_ilp32_ldbl64.c // msg_247_portable.c -/* lint1-only-if: lp64 ldbl-128 */ +/* lint1-only-if: lp64 ldbl128 */ /* lint1-extra-flags: -c -X 351 */ typedef double double_array[5]; diff --git a/tests/usr.bin/xlint/lint1/msg_247_portable.c b/tests/usr.bin/xlint/lint1/msg_247_portable.c index 718dad878c0..29025f56fc3 100644 --- a/tests/usr.bin/xlint/lint1/msg_247_portable.c +++ b/tests/usr.bin/xlint/lint1/msg_247_portable.c @@ -1,4 +1,4 @@ -/* $NetBSD: msg_247_portable.c,v 1.1 2023/07/05 11:36:56 rillig Exp $ */ +/* $NetBSD: msg_247_portable.c,v 1.2 2023/07/05 11:42:14 rillig Exp $ */ # 3 "msg_247_portable.c" // Test for message: pointer cast from '%s' to '%s' may be troublesome [247] @@ -8,8 +8,8 @@ // Analogous for the floating point types and the complex types. // // See also: -// msg_247_ilp32.c -// msg_247_lp64.c +// msg_247_ilp32_ldbl64.c +// msg_247_lp64_ldbl128.c /* lint1-extra-flags: -c -p -X 351 */ diff --git a/tests/usr.bin/xlint/lint1/platform_ldbl128.c b/tests/usr.bin/xlint/lint1/platform_ldbl128.c index 9b3a4090468..184926d97e5 100644 --- a/tests/usr.bin/xlint/lint1/platform_ldbl128.c +++ b/tests/usr.bin/xlint/lint1/platform_ldbl128.c @@ -1,4 +1,4 @@ -/* $NetBSD: platform_ldbl128.c,v 1.5 2023/04/05 20:17:30 rillig Exp $ */ +/* $NetBSD: platform_ldbl128.c,v 1.6 2023/07/05 11:42:14 rillig Exp $ */ # 3 "platform_ldbl128.c" /* @@ -6,7 +6,7 @@ */ /* lint1-extra-flags: -c -h -a -p -b -r -z -X 351 */ -/* lint1-only-if: ldbl-128 */ +/* lint1-only-if: ldbl128 */ /* CONSTCOND */ typedef int bits_per_byte[((unsigned char)-1) == 255 ? 1 : -1]; diff --git a/tests/usr.bin/xlint/lint1/platform_ldbl64.c b/tests/usr.bin/xlint/lint1/platform_ldbl64.c index 7b811ca914d..16d23baee72 100644 --- a/tests/usr.bin/xlint/lint1/platform_ldbl64.c +++ b/tests/usr.bin/xlint/lint1/platform_ldbl64.c @@ -1,4 +1,4 @@ -/* $NetBSD: platform_ldbl64.c,v 1.4 2023/04/05 20:13:01 rillig Exp $ */ +/* $NetBSD: platform_ldbl64.c,v 1.5 2023/07/05 11:42:14 rillig Exp $ */ # 3 "platform_ldbl64.c" /* @@ -6,7 +6,7 @@ */ /* lint1-extra-flags: -c -h -a -p -b -r -z -X 351 */ -/* lint1-only-if: ldbl-64 */ +/* lint1-only-if: ldbl64 */ /* CONSTCOND */ typedef int bits_per_byte[((unsigned char)-1) == 255 ? 1 : -1]; diff --git a/tests/usr.bin/xlint/lint1/platform_ldbl96.c b/tests/usr.bin/xlint/lint1/platform_ldbl96.c index 029b85a39df..739ce69e9bd 100644 --- a/tests/usr.bin/xlint/lint1/platform_ldbl96.c +++ b/tests/usr.bin/xlint/lint1/platform_ldbl96.c @@ -1,4 +1,4 @@ -/* $NetBSD: platform_ldbl96.c,v 1.5 2023/04/05 20:17:30 rillig Exp $ */ +/* $NetBSD: platform_ldbl96.c,v 1.6 2023/07/05 11:42:14 rillig Exp $ */ # 3 "platform_ldbl96.c" /* @@ -6,7 +6,7 @@ */ /* lint1-extra-flags: -c -h -a -p -b -r -z -X 351 */ -/* lint1-only-if: ldbl-96 */ +/* lint1-only-if: ldbl96 */ /* CONSTCOND */ typedef int bits_per_byte[((unsigned char)-1) == 255 ? 1 : -1]; diff --git a/tests/usr.bin/xlint/lint1/t_integration.sh b/tests/usr.bin/xlint/lint1/t_integration.sh index df635804045..1d965f6d041 100644 --- a/tests/usr.bin/xlint/lint1/t_integration.sh +++ b/tests/usr.bin/xlint/lint1/t_integration.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_integration.sh,v 1.81 2023/06/24 07:45:36 rillig Exp $ +# $NetBSD: t_integration.sh,v 1.82 2023/07/05 11:42:14 rillig Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -37,34 +37,34 @@ configure_test_case() awk=' BEGIN { # see ./gen-platforms.sh - platform["aarch64"] = "uchar lp64 long ldbl-128" - platform["alpha"] = "schar lp64 long ldbl-64" - platform["arm"] = "uchar ilp32 long ldbl-64" - platform["coldfire"] = "schar ilp32 int ldbl-64" - platform["hppa"] = "schar ilp32 long ldbl-64" - platform["i386"] = "schar ilp32 int ldbl-96" - platform["ia64"] = "schar lp64 long ldbl-128" - platform["m68000"] = "schar ilp32 int ldbl-64" - platform["m68k"] = "schar ilp32 int ldbl-96" - platform["mips"] = "schar ilp32 ???? ldbl-64" - platform["mips64"] = "schar ilp32 long ldbl-128" - platform["mipsn64"] = "schar lp64 long ldbl-128" - platform["or1k"] = "schar ilp32 int ldbl-64" - platform["powerpc"] = "uchar ilp32 int ldbl-64" - platform["powerpc64"] = "uchar lp64 long ldbl-64" - platform["riscv32"] = "schar ilp32 int ldbl-64" - platform["riscv64"] = "schar lp64 long ldbl-64" - platform["sh3"] = "schar ilp32 int ldbl-64" - platform["sparc"] = "schar ilp32 long ldbl-64" - platform["sparc64"] = "schar lp64 long ldbl-128" - platform["vax"] = "schar ilp32 long ldbl-64" - platform["x86_64"] = "schar lp64 long ldbl-128" + platform["aarch64"] = "uchar lp64 long ldbl128" + platform["alpha"] = "schar lp64 long ldbl64" + platform["arm"] = "uchar ilp32 long ldbl64" + platform["coldfire"] = "schar ilp32 int ldbl64" + platform["hppa"] = "schar ilp32 long ldbl64" + platform["i386"] = "schar ilp32 int ldbl96" + platform["ia64"] = "schar lp64 long ldbl128" + platform["m68000"] = "schar ilp32 int ldbl64" + platform["m68k"] = "schar ilp32 int ldbl96" + platform["mips"] = "schar ilp32 ???? ldbl64" + platform["mips64"] = "schar ilp32 long ldbl128" + platform["mipsn64"] = "schar lp64 long ldbl128" + platform["or1k"] = "schar ilp32 int ldbl64" + platform["powerpc"] = "uchar ilp32 int ldbl64" + platform["powerpc64"] = "uchar lp64 long ldbl64" + platform["riscv32"] = "schar ilp32 int ldbl64" + platform["riscv64"] = "schar lp64 long ldbl64" + platform["sh3"] = "schar ilp32 int ldbl64" + platform["sparc"] = "schar ilp32 long ldbl64" + platform["sparc64"] = "schar lp64 long ldbl128" + platform["vax"] = "schar ilp32 long ldbl64" + platform["x86_64"] = "schar lp64 long ldbl128" } function platform_has(prop) { if (platform[prop] != "") return prop == archsubdir - if (!match(prop, /^(schar|uchar|ilp32|lp64|int|long|ldbl-64|ldbl-96|ldbl-128)$/)) { + if (!match(prop, /^(schar|uchar|ilp32|lp64|int|long|ldbl64|ldbl96|ldbl128)$/)) { printf("bad property '\''%s'\''\n", prop) > "/dev/stderr" exit(1) } |
