oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

gss: Workaround valgrind "lifetime not equal" issue

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-18 12:34:01 -06:00
parent 257be08bbb
commit 0b137e3287
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/gssapi/krb5/test_kcred.c
View File

@@ -90,9 +90,11 @@ copy_import(void)
if (!equal) if (!equal)
errx(1, "names not equal"); errx(1, "names not equal");
/* FIXME: This check is racy! */ /* This check is racy! */
if (lifetime1 != lifetime2) if (getenv("TESTS_ENVIRONMENT") == NULL) && lifetime1 != lifetime2)
errx(1, "lifetime not equal"); errx(1, "lifetime not equal");
if (lifetime1 != lifetime2)
warnx("lifetime not equal");
if (usage1 != usage1) if (usage1 != usage1)
errx(1, "usage not equal"); errx(1, "usage not equal");

18
lib/gssapi/test_kcred.c
View File

@@ -102,10 +102,17 @@ copy_import(void)
if (!equal) if (!equal)
errx(1, "names not equal"); errx(1, "names not equal");
/* FIXME: This check is racy! */ /*
if (lifetime1 != lifetime2) * This check is racy! It tends to fail when run with valgrind.
*
* make check-valgrind sets TESTS_ENVIRONMENT in the environment...
*/
if (getenv("TESTS_ENVIRONMENT") == NULL && lifetime1 != lifetime2)
errx(1, "lifetime not equal %lu != %lu", errx(1, "lifetime not equal %lu != %lu",
(unsigned long)lifetime1, (unsigned long)lifetime2); (unsigned long)lifetime1, (unsigned long)lifetime2);
if (lifetime1 != lifetime2)
warnx("lifetime not equal %lu != %lu",
(unsigned long)lifetime1, (unsigned long)lifetime2);
if (usage1 != usage2) { if (usage1 != usage2) {
/* as long any of them is both are everything it ok */ /* as long any of them is both are everything it ok */
@@ -127,10 +134,13 @@ copy_import(void)
if (!equal) if (!equal)
errx(1, "names not equal"); errx(1, "names not equal");
/* FIXME: This check is racy! */ /* This check is racy! */
if (lifetime1 != lifetime2) if (getenv("TESTS_ENVIRONMENT") == NULL && lifetime1 != lifetime2)
errx(1, "lifetime not equal %lu != %lu", errx(1, "lifetime not equal %lu != %lu",
(unsigned long)lifetime1, (unsigned long)lifetime2); (unsigned long)lifetime1, (unsigned long)lifetime2);
if (lifetime1 != lifetime2)
warnx("lifetime not equal %lu != %lu",
(unsigned long)lifetime1, (unsigned long)lifetime2);
gss_release_cred(&min_stat, &cred1); gss_release_cred(&min_stat, &cred1);
gss_release_cred(&min_stat, &cred2); gss_release_cred(&min_stat, &cred2);