From: Patrick Steinhardt <ps@pks.im> To: util-linux@vger.kernel.org Cc: Patrick Steinhardt <ps@pks.im> Subject: [PATCH 4/6] tests: col: avoid hardcoding of errno string Date: Fri, 23 Aug 2019 12:17:01 +0200 Message-ID: <e6b9f781b884ccca6906c46e55693c4eaa01665f.1566555078.git.ps@pks.im> (raw) In-Reply-To: <cover.1566555078.git.ps@pks.im> The col/multibyte test has a hardcoded error string as part of its expected output that is returned by glibc's strerror(3P) function. Even though many of these strings are the same across libc implementations, they are not standardiced and some are certainly different. One example is the string for EILSEQ on musl libc. To fix this, we introduce a new test helper "test_strerror". The helper can be invoked with an error code like "EILSEQ", which will cause it to print out the the respective error message for that code. Note that "test_strerror" cannot act on the error's value (e.g. 84 for EILSEQ), as these aren't standardized either. Instead, we thus need to have an array of the error's string representation ("EILSEQ") to its respective error code (the define EILSEQ). The array can trivially be extended as required, thus it is only sparsely populated with EILSEQ right now. To fix the col/multibyte test, we introduce a call to sed(1) to replace the strerror(3P) message from EILSEQ with "EILSEQ". Furthermore, as we're running tests with the POSIX locale by default which treats all bytes as valid multibyte sequences, we have to change to the C.UTF-8 locale instead to actually get an error. Signed-off-by: Patrick Steinhardt <ps@pks.im> --- tests/commands.sh | 1 + tests/expected/col/multibyte | 2 +- tests/helpers/Makemodule.am | 3 +++ tests/helpers/test_strerror.c | 42 +++++++++++++++++++++++++++++++++++ tests/ts/col/multibyte | 5 +++-- 5 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 tests/helpers/test_strerror.c diff --git a/tests/commands.sh b/tests/commands.sh index 5cc34f6b3..9fcd488ce 100644 --- a/tests/commands.sh +++ b/tests/commands.sh @@ -33,6 +33,7 @@ TS_HELPER_PARTITIONS="${ts_helpersdir}sample-partitions" TS_HELPER_PATHS="${ts_helpersdir}test_pathnames" TS_HELPER_SCRIPT="${ts_helpersdir}test_script" TS_HELPER_SIGRECEIVE="${ts_helpersdir}test_sigreceive" +TS_HELPER_STRERROR="${ts_helpersdir}test_strerror" TS_HELPER_STRUTILS="${ts_helpersdir}test_strutils" TS_HELPER_SYSINFO="${ts_helpersdir}test_sysinfo" TS_HELPER_TIOCSTI="${ts_helpersdir}test_tiocsti" diff --git a/tests/expected/col/multibyte b/tests/expected/col/multibyte index 4e299adc1..abf607249 100644 --- a/tests/expected/col/multibyte +++ b/tests/expected/col/multibyte @@ -1 +1 @@ -col: failed on line 1: Invalid or incomplete multibyte or wide character +col: failed on line 1: EILSEQ diff --git a/tests/helpers/Makemodule.am b/tests/helpers/Makemodule.am index ab0b3cea9..a34cd8d2a 100644 --- a/tests/helpers/Makemodule.am +++ b/tests/helpers/Makemodule.am @@ -14,6 +14,9 @@ test_sha1_SOURCES = tests/helpers/test_sha1.c lib/sha1.c check_PROGRAMS += test_pathnames test_pathnames_SOURCES = tests/helpers/test_pathnames.c +check_PROGRAMS += test_strerror +test_strerror_SOURCES = tests/helpers/test_strerror.c + check_PROGRAMS += test_sysinfo test_sysinfo_SOURCES = tests/helpers/test_sysinfo.c diff --git a/tests/helpers/test_strerror.c b/tests/helpers/test_strerror.c new file mode 100644 index 000000000..1919698eb --- /dev/null +++ b/tests/helpers/test_strerror.c @@ -0,0 +1,42 @@ +/* + * This test program prints errno messages to allow for portable + * verification of error messages. + * + * Copyright (C) 2019 Patrick Steinhardt <ps@pks.im + * + * This file may be redistributed under the terms of the GNU Public + * License. + */ + +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#define E(x) { #x, x } +static struct { + const char *str; + int error; +} errors[] = { + E(EILSEQ) +}; + +int main(int argc, const char *argv[]) +{ + size_t i; + + if (argc != 2) { + fprintf(stderr, "USAGE: %s <errno>\n", argv[0]); + return -1; + } + + for (i = 0; i < sizeof(errors)/sizeof(*errors); i++) { + if (strcmp(errors[i].str, argv[1])) + continue; + puts(strerror(errors[i].error)); + return 0; + } + + fprintf(stderr, "Invalid errno: %s\n", argv[1]); + return -1; +} diff --git a/tests/ts/col/multibyte b/tests/ts/col/multibyte index e9c02922e..1ed4b5ff8 100755 --- a/tests/ts/col/multibyte +++ b/tests/ts/col/multibyte @@ -22,8 +22,9 @@ TS_DESC="multibyte input" ts_init "$*" ts_check_test_command "$TS_CMD_COL" +ts_check_test_command "$TS_HELPER_STRERROR" -cat $TS_SELF/multibyte.data | $TS_CMD_COL > /dev/null 2> $TS_OUTPUT +cat $TS_SELF/multibyte.data | LC_ALL=C.UTF-8 $TS_CMD_COL 2>&1 > /dev/null | + sed -e "s@$($TS_HELPER_STRERROR EILSEQ)@EILSEQ@" > $TS_OUTPUT ts_finalize - -- 2.23.0
next prev parent reply index Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-23 10:16 [PATCH 0/6] Test suite fixes for musl libc Patrick Steinhardt 2019-08-23 10:16 ` [PATCH 1/6] tests: remove reliance on buffer behaviour of stderr/stdout streams Patrick Steinhardt 2019-08-23 10:16 ` [PATCH 2/6] tests: colcrt: fix reliance on EILSEQ in POSIX locale Patrick Steinhardt 2019-08-23 10:17 ` [PATCH 3/6] tests: column: use actually invalid multibytes to test encoding Patrick Steinhardt 2019-08-23 10:17 ` Patrick Steinhardt [this message] 2019-08-23 10:17 ` [PATCH 5/6] tests: fdisk: avoid hardcoding of errno string Patrick Steinhardt 2019-08-23 10:17 ` [PATCH 6/6] tests: libfdisk: remove reliance on buffer behaviour of standard streams Patrick Steinhardt 2019-08-23 12:15 ` Karel Zak 2019-08-23 13:32 ` [PATCH v2 0/6] Test suite fixes for musl libc Patrick Steinhardt 2019-08-23 13:32 ` [PATCH v2 1/6] tests: remove reliance on buffer behaviour of stderr/stdout streams Patrick Steinhardt 2019-08-27 11:17 ` Karel Zak 2019-08-27 11:49 ` Patrick Steinhardt 2019-08-27 12:32 ` Karel Zak 2019-08-27 11:55 ` Patrick Steinhardt 2019-08-27 12:31 ` Karel Zak 2019-08-27 12:26 ` [PATCH] tests: use env and support both unbuffer/stdbuf Patrick Steinhardt 2019-08-27 12:46 ` Karel Zak 2019-08-28 10:51 ` Karel Zak 2019-08-30 19:08 ` Karel Zak 2019-08-31 7:41 ` Patrick Steinhardt 2019-08-23 13:32 ` [PATCH v2 2/6] tests: libfdisk: remove reliance on buffer behaviour of standard streams Patrick Steinhardt 2019-08-23 13:32 ` [PATCH v2 3/6] tests: colcrt: fix reliance on EILSEQ in POSIX locale Patrick Steinhardt 2019-08-23 13:32 ` [PATCH v2 4/6] tests: column: use actually invalid multibytes to test encoding Patrick Steinhardt 2019-08-23 13:32 ` [PATCH v2 5/6] tests: col: avoid hardcoding of errno string Patrick Steinhardt 2019-08-23 13:32 ` [PATCH v2 6/6] tests: fdisk: " Patrick Steinhardt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e6b9f781b884ccca6906c46e55693c4eaa01665f.1566555078.git.ps@pks.im \ --to=ps@pks.im \ --cc=util-linux@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Util-Linux Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/util-linux/0 util-linux/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 util-linux util-linux/ https://lore.kernel.org/util-linux \ util-linux@vger.kernel.org public-inbox-index util-linux Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.util-linux AGPL code for this site: git clone https://public-inbox.org/public-inbox.git