On Mon, Jan 6, 2014 at 2:19 PM, Andrew Gregory andrew.gregory.8@gmail.comwrote:

Let valgrind do the work of writing any suppression rules needed by the test suite.

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com

This makes sense. It just makes it a heck of a lot easier to get the possible suppression into the file, but it doesn't actually write it out for you.

Signed-off-by: Dan McGee dan@archlinux.org

test/pacman/pmtest.py | 1 +

1 file changed, 1 insertion(+)

diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index e5094a1..1c3ea7c 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -220,6 +220,7 @@ def run(self, pacman): cmd.extend(["libtool", "execute", "valgrind", "-q", "--tool=memcheck", "--leak-check=full", "--show-reachable=yes",

•            "--gen-suppressions=all",
             "--log-file=%s" % os.path.join(self.root,
  

"var/log/valgrind"), "--suppressions=%s" % suppfile]) cmd.extend([pacman["bin"], -- 1.8.5.2

On Mon, Jan 6, 2014 at 2:19 PM, Andrew Gregory andrew.gregory.8@gmail.comwrote:

Silences false warnings after alpm forks to run install scripts.

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com

We didn't actually run install scripts in the test suite before if I remember right, so there was likely no need for this option before. Seems reasonable to add, especially given these forks are short-lived anyway and they can just clean themselves up.

test/pacman/pmtest.py | 1 + 1 file changed, 1 insertion(+)

diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 1c3ea7c..e780a6d 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -221,6 +221,7 @@ def run(self, pacman): "--tool=memcheck", "--leak-check=full", "--show-reachable=yes", "--gen-suppressions=all",

•            "--child-silent-after-fork=yes",
             "--log-file=%s" % os.path.join(self.root,
  

"var/log/valgrind"), "--suppressions=%s" % suppfile]) cmd.extend([pacman["bin"], -- 1.8.5.2

On Mon, Jan 6, 2014 at 2:19 PM, Andrew Gregory andrew.gregory.8@gmail.comwrote:

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com

Seems like this is two patches in one- one to add FILE_EMPTY, and one to use it.

How does FILE_EMPTY behave in these cases? Namely the first one feels like a gray area that the code does not make super obvious. * File doesn't exist * File exists, is empty * File exists, is not empty * File is a directory

Also, don't we document the available rules somewhere?

test/pacman/pmrule.py | 3 +++ test/pacman/pmtest.py | 1 + 2 files changed, 4 insertions(+)

diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index ba94ab8..96ecdec 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -112,6 +112,9 @@ def check(self, test): if case == "EXIST": if not os.path.isfile(filename): success = 0

•        elif case == "EMPTY":
  

•            if not os.path.getsize(filename) == 0:
  

•                success = 0
         elif case == "MODIFIED":
             for f in test.files:
                 if f.name == key:
  

diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index e780a6d..7079b78 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -224,6 +224,7 @@ def run(self, pacman): "--child-silent-after-fork=yes", "--log-file=%s" % os.path.join(self.root, "var/log/valgrind"), "--suppressions=%s" % suppfile])

•        self.addrule("FILE_EMPTY=var/log/valgrind")
     cmd.extend([pacman["bin"],
         "--config", os.path.join(self.root, util.PACCONF),
         "--root", self.root,
  

-- 1.8.5.2

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com --- test/pacman/README | 5 +++++ test/pacman/pmtest.py | 1 + 2 files changed, 6 insertions(+)

diff --git a/test/pacman/README b/test/pacman/README index 2516a8a..8d8354a 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -62,6 +62,11 @@ This example will run all tests from the "tests" directory. Use the "help" option to get the full list of parameters: ./pactest.py --help

+When run with the `--valgrind' option, an additional rule will be added to all +tests to check for memory leaks. To use `--valgrind' when running the full +test suite, run: + make PY_LOG_FLAGS=--valgrind check + The following pieces of software are required to run the pactest suite:

fakeroot (required to run as non-root user) diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index e780a6d..7079b78 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -224,6 +224,7 @@ def run(self, pacman): "--child-silent-after-fork=yes", "--log-file=%s" % os.path.join(self.root, "var/log/valgrind"), "--suppressions=%s" % suppfile]) + self.addrule("FILE_EMPTY=var/log/valgrind") cmd.extend([pacman["bin"], "--config", os.path.join(self.root, util.PACCONF), "--root", self.root,