From 3577da19cfa2f6485518dbbd3404e0fee54a24b8 Mon Sep 17 00:00:00 2001 From: Thomas Orozco Date: Fri, 26 Jun 2015 21:33:16 +0200 Subject: [PATCH] Adjust tests to support tini-static Valgrind does like statically-linked binaries due to false positives coming from libc, which are ignord only if Valgrind can tell they're in libc (which isn't the case when using static linking). --- test/test.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test.py b/test/test.py index 5fdb4ad..b161dad 100644 --- a/test/test.py +++ b/test/test.py @@ -97,10 +97,11 @@ if __name__ == "__main__": Command(functional_base_cmd + ["--", "zzzz"], fail_cmd).run(retcode=1) Command(functional_base_cmd + ["-h"], fail_cmd).run() - # Valgrind test - Command(functional_base_cmd + ["--", "valgrind", "--leak-check=full", "--error-exitcode=1", entrypoint, "-v", "--", "ls"], fail_cmd).run() + # Valgrind test (we only run this on the dynamic version, because otherwise Valgrind may bring up plenty of errors that are + # actually from libc) + Command(functional_base_cmd + ["--", "valgrind", "--leak-check=full", "--error-exitcode=1", "/tini/dist/tini", "-v", "--", "ls"], fail_cmd).run() - # Install tests (sh -c is used for globbing and &&) + # Installation tests (sh -c is used for globbing and &&) for image, pkg_manager, extension in [ ["ubuntu:precise", "dpkg", "deb"], ["ubuntu:trusty", "dpkg", "deb"],