From: "Alexandra Hájková" <alexandra.khirnova@gmail.com>
To: libc-alpha@sourceware.org
Cc: "Alexandra Hájková" <ahajkova@redhat.com>,
"Mark Wielaard" <mark@klomp.org>
Subject: [PATCH] Add valgrind smoke test
Date: Mon, 6 Dec 2021 15:40:43 +0100 [thread overview]
Message-ID: <20211206144043.858697-1-ahajkova@redhat.com> (raw)
From: Alexandra Hájková <ahajkova@redhat.com>
Check if valgrind is present during the configure time and
run smoke tests with valgrind to verify dynamic loader.
Co-authored-by: Mark Wielaard <mark@klomp.org>
---
elf/Makefile | 7 +++++++
elf/tst-valgrind-smoke.sh | 38 ++++++++++++++++++++++++++++++++++++++
elf/valgrind-test.c | 31 +++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+)
create mode 100644 elf/tst-valgrind-smoke.sh
create mode 100644 elf/valgrind-test.c
diff --git a/elf/Makefile b/elf/Makefile
index ef36008673..14aab3624a 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -232,6 +232,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \
tst-dl-is_dso tst-ro-dynamic \
tst-audit18 \
tst-rtld-run-static \
+ valgrind-test
# reldep9
tests-internal += loadtest unload unload2 circleload1 \
neededtest neededtest2 neededtest3 neededtest4 \
@@ -253,6 +254,12 @@ tests-special += $(objpfx)tst-audit14-cmp.out $(objpfx)tst-audit15-cmp.out \
endif
endif
endif
+
+tests-special += $(objpfx)tst-valgrind-smoke.out
+$(objpfx)tst-valgrind-smoke.out: tst-valgrind-smoke.sh $(objpfx)ld.so
+ $(SHELL) $< $(objpfx)ld.so '$(test-wrapper-env)' '$(run-program-env)' '$(rpath-link)' $(objpfx)valgrind-test > $@; \
+ $(evaluate-test)
+
tests += $(tests-execstack-$(have-z-execstack))
ifeq ($(run-built-tests),yes)
tests-special += $(objpfx)tst-leaks1-mem.out \
diff --git a/elf/tst-valgrind-smoke.sh b/elf/tst-valgrind-smoke.sh
new file mode 100644
index 0000000000..a78d7ff10d
--- /dev/null
+++ b/elf/tst-valgrind-smoke.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# Valgrind smoke test.
+# Copyright (C) 2021 Free Software Foundation, Inc.
+# This file is part of the GNU C Library.
+
+# The GNU C Library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# The GNU C Library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNU C Library; if not, see
+# <https://www.gnu.org/licenses/>.
+
+set -e
+
+rtld=$1
+test_wrapper_env=$2
+run_program_env=$3
+library_path=$4
+test_prog=$5
+
+# Test whether valgrind is available in the test
+# environment. If not, skip the test.
+${test_wrapper_env} \
+${run_program_env} \
+$rtld --library-path "$library_path" \
+ /bin/sh -c 'command -v valgrind' || exit 77
+
+${test_wrapper_env} \
+${run_program_env} \
+$rtld --library-path "$library_path" \
+/bin/sh -c "valgrind -q --error-exitcode=1 $test_prog"
diff --git a/elf/valgrind-test.c b/elf/valgrind-test.c
new file mode 100644
index 0000000000..606c874b68
--- /dev/null
+++ b/elf/valgrind-test.c
@@ -0,0 +1,31 @@
+/* This is the simple test intended to be called by
+ tst-valgrind-smoke to perform vagrind smoke test.
+ Copyright (C) 2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <libintl.h>
+#include <locale.h>
+
+int
+main (void)
+{
+ setlocale (LC_ALL, "");
+ bindtextdomain ("translit", "");
+ textdomain ("translit");
+
+ return 0;
+}
--
2.26.3
next reply other threads:[~2021-12-06 14:40 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 14:40 Alexandra Hájková [this message]
2021-12-07 11:56 ` Mark Wielaard
2021-12-07 20:32 ` DJ Delorie
2021-12-07 20:58 ` Florian Weimer
2021-12-07 21:10 ` DJ Delorie
2021-12-10 12:56 ` Mark Wielaard
2021-12-10 13:07 ` Florian Weimer
2021-12-10 19:15 ` DJ Delorie
2021-12-13 12:55 ` Mark Wielaard
2021-12-17 18:26 ` Alexandra Hájková
2021-12-17 21:07 ` DJ Delorie
2021-12-20 11:31 ` Alexandra Petlanova Hajkova
2021-12-20 11:37 ` Alexandra Hájková
2022-01-10 12:13 ` Mark Wielaard
2022-01-10 12:38 ` Adhemerval Zanella
2022-01-12 17:15 ` Alexandra Hájková
2022-01-20 19:35 ` Alexandra Hájková
2022-01-24 18:34 ` Joseph Myers
2022-01-26 17:46 ` Joseph Myers
2022-01-26 17:59 ` Mark Wielaard
2022-01-26 18:40 ` Joseph Myers
2022-01-26 19:23 ` Mark Wielaard
2022-01-20 21:29 ` DJ Delorie
-- strict thread matches above, loose matches on Subject: below --
2021-05-24 12:15 Alexandra Hájková
2021-05-24 14:28 ` Carlos O'Donell
2021-05-24 19:28 ` Joseph Myers
2021-06-28 8:29 ` Florian Weimer
2021-06-28 18:33 ` Joseph Myers
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=20211206144043.858697-1-ahajkova@redhat.com \
--to=alexandra.khirnova@gmail.com \
--cc=ahajkova@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=mark@klomp.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
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).