Module: ppl/ppl Branch: ppl-0_11-branch Commit: dbf8e2232866146aeb2c3fbadd04c50743a90866 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dbf8e22328661... Author: Roberto Bagnara <bagnara@cs.unipr.it> Date: Mon Feb 14 10:14:41 2011 +0100 Reduce the argument of valgrind's --num-callers below the allowed maximum. --- Watchdog/tests/Makefile.am | 2 +- demos/ppl_pips/Makefile.am | 2 +- interfaces/C/tests/Makefile.am | 12 +++++++++++- interfaces/OCaml/tests/Makefile.am | 2 +- interfaces/Prolog/SWI/Makefile.am | 2 +- tests/Ask_Tell/Makefile.am | 2 +- tests/BD_Shape/Makefile.am | 2 +- tests/Box/Makefile.am | 2 +- tests/Grid/Makefile.am | 2 +- tests/MIP_Problem/Makefile.am | 2 +- tests/Octagonal_Shape/Makefile.am | 2 +- tests/PIP_Problem/Makefile.am | 2 +- tests/Partially_Reduced_Product/Makefile.am | 2 +- tests/Polyhedron/Makefile.am | 2 +- tests/Powerset/Makefile.am | 2 +- 15 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Watchdog/tests/Makefile.am b/Watchdog/tests/Makefile.am index 7965de3..3bbdd2b 100644 --- a/Watchdog/tests/Makefile.am +++ b/Watchdog/tests/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(srcdir)/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/demos/ppl_pips/Makefile.am b/demos/ppl_pips/Makefile.am index 4e3fa6f..57be020 100644 --- a/demos/ppl_pips/Makefile.am +++ b/demos/ppl_pips/Makefile.am @@ -27,7 +27,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/interfaces/C/tests/Makefile.am b/interfaces/C/tests/Makefile.am index e77cc3e..323383f 100644 --- a/interfaces/C/tests/Makefile.am +++ b/interfaces/C/tests/Makefile.am @@ -21,8 +21,18 @@ # For the most up-to-date information see the Parma Polyhedra Library # site: http://www.cs.unipr.it/ppl/ . +if VALGRIND_TESTS_ENABLED + +CHECKER = \ +$(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ +--num-callers=40 --leak-resolution=high \ +--suppressions=$(top_srcdir)/tests/valgrind_suppressions + +else !VALGRIND_TESTS_ENABLED + CHECKER = -#CHECKER = valgrind --tool=memcheck -q --trace-children=yes --leak-check=yes --num-callers=100 --leak-resolution=high --suppressions=$(top_srcdir)/tests/valgrind_suppressions + +endif !VALGRIND_TESTS_ENABLED TESTS_ENVIRONMENT = $(CHECKER) diff --git a/interfaces/OCaml/tests/Makefile.am b/interfaces/OCaml/tests/Makefile.am index 2f35c98..d8c8d54 100644 --- a/interfaces/OCaml/tests/Makefile.am +++ b/interfaces/OCaml/tests/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(srcdir)/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 5565918..078fac0 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/Ask_Tell/Makefile.am b/tests/Ask_Tell/Makefile.am index 7b9620d..3cd30ea 100644 --- a/tests/Ask_Tell/Makefile.am +++ b/tests/Ask_Tell/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/BD_Shape/Makefile.am b/tests/BD_Shape/Makefile.am index 5202917..732d0e2 100644 --- a/tests/BD_Shape/Makefile.am +++ b/tests/BD_Shape/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/Box/Makefile.am b/tests/Box/Makefile.am index 927fe71..8688993 100644 --- a/tests/Box/Makefile.am +++ b/tests/Box/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/Grid/Makefile.am b/tests/Grid/Makefile.am index 8d11ff3..581ad16 100644 --- a/tests/Grid/Makefile.am +++ b/tests/Grid/Makefile.am @@ -26,7 +26,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/MIP_Problem/Makefile.am b/tests/MIP_Problem/Makefile.am index 22f2a42..4c2b82e 100644 --- a/tests/MIP_Problem/Makefile.am +++ b/tests/MIP_Problem/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/Octagonal_Shape/Makefile.am b/tests/Octagonal_Shape/Makefile.am index a428fb3..f1b4b06 100644 --- a/tests/Octagonal_Shape/Makefile.am +++ b/tests/Octagonal_Shape/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/PIP_Problem/Makefile.am b/tests/PIP_Problem/Makefile.am index bf9e9bb..d2cba6e 100644 --- a/tests/PIP_Problem/Makefile.am +++ b/tests/PIP_Problem/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/Partially_Reduced_Product/Makefile.am b/tests/Partially_Reduced_Product/Makefile.am index a4901a2..a4f58f5 100644 --- a/tests/Partially_Reduced_Product/Makefile.am +++ b/tests/Partially_Reduced_Product/Makefile.am @@ -26,7 +26,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/Polyhedron/Makefile.am b/tests/Polyhedron/Makefile.am index 21067de..4ff8b49 100644 --- a/tests/Polyhedron/Makefile.am +++ b/tests/Polyhedron/Makefile.am @@ -25,7 +25,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED diff --git a/tests/Powerset/Makefile.am b/tests/Powerset/Makefile.am index 705a421..222cd01 100644 --- a/tests/Powerset/Makefile.am +++ b/tests/Powerset/Makefile.am @@ -26,7 +26,7 @@ if VALGRIND_TESTS_ENABLED CHECKER = \ $(VALGRIND) --tool=memcheck -q --trace-children=yes --leak-check=yes \ ---num-callers=100 --leak-resolution=high \ +--num-callers=40 --leak-resolution=high \ --suppressions=$(top_srcdir)/tests/valgrind_suppressions else !VALGRIND_TESTS_ENABLED