From: Tao Su <tao1.su@linux.intel.com>
To: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-sound@vger.kernel.org, kvm@vger.kernel.org,
netdev@vger.kernel.org, linux-rtc@vger.kernel.org,
linux-sgx@vger.kernel.org
Cc: akpm@linux-foundation.org, edliaw@google.com,
ivan.orlov0322@gmail.com, broonie@kernel.org, perex@perex.cz,
tiwai@suse.com, shuah@kernel.org, seanjc@google.com,
pbonzini@redhat.com, bongsu.jeon@samsung.com,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, alexandre.belloni@bootlin.com,
jarkko@kernel.org, dave.hansen@linux.intel.com,
tao1.su@linux.intel.com
Subject: [PATCH v2 1/2] Revert "selftests/harness: remove use of LINE_MAX"
Date: Thu, 9 May 2024 13:31:12 +0800 [thread overview]
Message-ID: <20240509053113.43462-2-tao1.su@linux.intel.com> (raw)
In-Reply-To: <20240509053113.43462-1-tao1.su@linux.intel.com>
This reverts commit 8092162335554c8ef5e7f50eff68aa9cfbdbf865.
asprintf() is declared in stdio.h when defining _GNU_SOURCE, but stdio.h
is so common that many files don’t define _GNU_SOURCE before including
stdio.h, and defining _GNU_SOURCE after including stdio.h will no longer
take effect, which causes warnings or even errors during compilation in
many selftests.
Revert 'commit 809216233555 ("selftests/harness: remove use of LINE_MAX")'
as that came in quite late in the 6.9 cycle.
Link: https://lore.kernel.org/linux-kselftest/ZjuA3aY_iHkjP7bQ@google.com/
Fixes: 809216233555 ("selftests/harness: remove use of LINE_MAX")
Signed-off-by: Tao Su <tao1.su@linux.intel.com>
---
tools/testing/selftests/kselftest_harness.h | 12 ++++--------
tools/testing/selftests/mm/mdwe_test.c | 1 -
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index d98702b6955d..ba3ddeda24bf 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -56,6 +56,7 @@
#include <asm/types.h>
#include <ctype.h>
#include <errno.h>
+#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
@@ -1158,7 +1159,7 @@ void __run_test(struct __fixture_metadata *f,
struct __test_metadata *t)
{
struct __test_xfail *xfail;
- char *test_name;
+ char test_name[LINE_MAX];
const char *diagnostic;
/* reset test struct */
@@ -1166,12 +1167,8 @@ void __run_test(struct __fixture_metadata *f,
t->trigger = 0;
memset(t->results->reason, 0, sizeof(t->results->reason));
- if (asprintf(&test_name, "%s%s%s.%s", f->name,
- variant->name[0] ? "." : "", variant->name, t->name) == -1) {
- ksft_print_msg("ERROR ALLOCATING MEMORY\n");
- t->exit_code = KSFT_FAIL;
- _exit(t->exit_code);
- }
+ snprintf(test_name, sizeof(test_name), "%s%s%s.%s",
+ f->name, variant->name[0] ? "." : "", variant->name, t->name);
ksft_print_msg(" RUN %s ...\n", test_name);
@@ -1209,7 +1206,6 @@ void __run_test(struct __fixture_metadata *f,
ksft_test_result_code(t->exit_code, test_name,
diagnostic ? "%s" : NULL, diagnostic);
- free(test_name);
}
static int test_harness_run(int argc, char **argv)
diff --git a/tools/testing/selftests/mm/mdwe_test.c b/tools/testing/selftests/mm/mdwe_test.c
index 1e01d3ddc11c..200bedcdc32e 100644
--- a/tools/testing/selftests/mm/mdwe_test.c
+++ b/tools/testing/selftests/mm/mdwe_test.c
@@ -7,7 +7,6 @@
#include <linux/mman.h>
#include <linux/prctl.h>
-#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <sys/auxv.h>
--
2.34.1
next prev parent reply other threads:[~2024-05-09 5:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 5:31 [PATCH v2 0/2] Selftests: Fix compilation warnings due to missing _GNU_SOURCE definition Tao Su
2024-05-09 5:31 ` Tao Su [this message]
2024-05-10 12:33 ` [PATCH v2 1/2] Revert "selftests/harness: remove use of LINE_MAX" Simon Horman
2024-05-09 5:31 ` [PATCH v2 2/2] selftests/harness: Use 1024 in place of LINE_MAX Tao Su
2024-05-10 12:33 ` Simon Horman
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=20240509053113.43462-2-tao1.su@linux.intel.com \
--to=tao1.su@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=alexandre.belloni@bootlin.com \
--cc=bongsu.jeon@samsung.com \
--cc=broonie@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=edliaw@google.com \
--cc=edumazet@google.com \
--cc=ivan.orlov0322@gmail.com \
--cc=jarkko@kernel.org \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pbonzini@redhat.com \
--cc=perex@perex.cz \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=tiwai@suse.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).