From: DJ Delorie <dj@redhat.com>
To: "Alexandra Hájková" <alexandra.khirnova@gmail.com>
Cc: libc-alpha@sourceware.org, mark@klomp.org, ahajkova@redhat.com
Subject: Re: [PATCH] Add valgrind smoke test
Date: Fri, 17 Dec 2021 16:07:41 -0500 [thread overview]
Message-ID: <xnlf0j7xeq.fsf@greed.delorie.com> (raw)
In-Reply-To: <20211217182633.1653228-1-ahajkova@redhat.com>
Alexandra Hjkov via Libc-alpha <libc-alpha@sourceware.org>
writes:
> Check if whether valgrind is available in the test environment.
> If not, skip the test. Run smoke tests with valgrind to verify dynamic loader.
> First, check if algrind works with the system ld.so in the test
> environment. Then run the actual test inside the test environment,
> using the just build ld.so and new libraries.
>
> Co-authored-by: Mark Wielaard <mark@klomp.org>
> diff --git a/elf/Makefile b/elf/Makefile
> + valgrind-test \
New test. Ok.
> @@ -256,6 +257,12 @@ tests-special += $(objpfx)tst-audit14-cmp.out $(objpfx)tst-audit15-cmp.out \
> +tests-special += $(objpfx)tst-valgrind-smoke.out
> +$(objpfx)tst-valgrind-smoke.out: tst-valgrind-smoke.sh $(objpfx)ld.so $(objpfx)valgrind-test
> + $(SHELL) $< $(objpfx)ld.so $(rtlddir)/$(rtld-installed-name) '$(test-wrapper-env)' '$(run-program-env)' '$(rpath-link)' $(objpfx)valgrind-test > $@; \
> + $(evaluate-test)
We're passing everything to the script, which is $<, so "see below".
Long lines should be wrapped, but Ok with that change.
> diff --git a/elf/tst-valgrind-smoke.sh b/elf/tst-valgrind-smoke.sh
> +#!/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/>.
Ok.
> +set -e
> +
> +rtld="$1"
> +system_rtld="$2"
> +test_wrapper_env="$3"
> +run_program_env="$4"
> +library_path="$5"
> +test_prog="$6"
rtld is $(objpfx)ld.so
system_rtld is $(rtlddir)/$(rtld-installed-name)
test_wrapper_env is '$(test-wrapper-env)' (either just "env" or script
to ssh, plus "env")
run_program_env is '$(run-program-env)' (just env vars)
library_path is '$(rpath-link)'
test_prog is $(objpfx)valgrind-test
ok
> +# Test whether valgrind is available in the test
> +# environment. If not, skip the test.
> +${test_wrapper_env} ${run_program_env} \
> + /bin/sh -c "command -v valgrind" || exit 77
Run valgrind with no options; we should only exit if valgrind is
missing. Ok.
> +# Test valgrind works with the system ld.so in the test environment
> +/bin/sh -c \
> + "${test_wrapper_env} ${run_program_env} \
> + valgrind -q --error-exitcode=1 \
> + ${system_rtld} ${test_prog} ${system_rtld}" || exit 77
runs on target, native valgrind with in-build test with native rtld...
Note that the test_prog built against the new glibc probably won't run
against the old installed glibc, esp if there's a version bump. You
might need to use something other than the test_prog, like /bin/echo,
for this test.
Running the build/test on an older Fedora version should have picked
this up.
> +# Finally the actual test inside the test environment,
> +# using the just build ld.so and new libraries to run
> +# the smoke test under valgrind.
> +/bin/sh -c \
> + "${test_wrapper_env} ${run_program_env} \
> + valgrind -q --error-exitcode=1 \
> + ${rtld} --library-path ${library_path} ${test_prog} ${rtld}"
runs on target, native valgrind, runs target program with new rtld and
libraries, ok.
> diff --git a/elf/valgrind-test.c b/elf/valgrind-test.c
> +/* 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>
> +#include <limits.h>
> +#include <stdlib.h>
> +#include <stdio.h>
> +
> +int
> +main (int argc, char **argv)
> +{
> + // Do some non-trivial stuff that has been known to trigger
> + // issues under valgrind in the past.
> + // Setting up the locale textdomain makes sure to test some
> + // string/path comparisons, file search and library loading.
> + setlocale (LC_ALL, "");
> + bindtextdomain ("translit", "");
> + textdomain ("translit");
> +
> + // Show what we are executing and how...
> + char *me = realpath (argv[0], NULL);
> + printf ("bin: %s\n", me);
> + printf ("ld.so: %s\n", argv[1]);
> + free (me);
> +
> + return 0;
> +}
Ok.
next prev parent reply other threads:[~2021-12-17 21:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 14:40 Alexandra Hájková
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 [this message]
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=xnlf0j7xeq.fsf@greed.delorie.com \
--to=dj@redhat.com \
--cc=ahajkova@redhat.com \
--cc=alexandra.khirnova@gmail.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).