diff options
| author | Marius Kintel <marius@kintel.net> | 2011-11-27 04:20:18 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-11-27 04:20:18 (GMT) |
| commit | 0fee2c55403a34014893f125682b3930a81ad2ed (patch) | |
| tree | d427e0d62e670bf21d500e9d95148a9b98b0982d | |
| parent | 04c340b35d8809b595ebb3ce53b7a00313d00a9b (diff) | |
Killed some memory leaks
| -rw-r--r-- | tests/cgalpngtest.cc | 3 | ||||
| -rw-r--r-- | tests/csgtermtest.cc | 4 | ||||
| -rw-r--r-- | tests/csgtestcore.cc | 3 | ||||
| -rw-r--r-- | tests/csgtexttest.cc | 3 | ||||
| -rw-r--r-- | tests/dumptest.cc | 6 | ||||
| -rw-r--r-- | tests/echotest.cc | 3 | ||||
| -rw-r--r-- | valgrind.supp | 11 |
7 files changed, 33 insertions, 0 deletions
diff --git a/tests/cgalpngtest.cc b/tests/cgalpngtest.cc index 60e630c..fcc5977 100644 --- a/tests/cgalpngtest.cc +++ b/tests/cgalpngtest.cc @@ -196,6 +196,9 @@ int main(int argc, char **argv) csgInfo.glview->paintGL(); csgInfo.glview->save(outfile); + delete root_node; + delete root_module; + Builtins::instance(true); return 0; diff --git a/tests/csgtermtest.cc b/tests/csgtermtest.cc index 8f2d76e..2383126 100644 --- a/tests/csgtermtest.cc +++ b/tests/csgtermtest.cc @@ -143,6 +143,10 @@ int main(int argc, char **argv) } outfile.close(); + if (root_term) root_term->unlink(); + delete root_node; + delete root_module; + Builtins::instance(true); return rc; diff --git a/tests/csgtestcore.cc b/tests/csgtestcore.cc index 034084c..49bd473 100644 --- a/tests/csgtestcore.cc +++ b/tests/csgtestcore.cc @@ -216,6 +216,9 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type) csgInfo.glview->save(outfilename); + delete root_node; + delete root_module; + Builtins::instance(true); return 0; diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index 76f6eb1..d7f94f1 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -129,6 +129,9 @@ int main(int argc, char **argv) outfile << csgcache[*root_node] << "\n"; outfile.close(); + delete root_node; + delete root_module; + Builtins::instance(true); return rc; diff --git a/tests/dumptest.cc b/tests/dumptest.cc index 4071669..22dd96c 100644 --- a/tests/dumptest.cc +++ b/tests/dumptest.cc @@ -139,6 +139,9 @@ int main(int argc, char **argv) outfile << dumpstdstr << "\n"; outfile.close(); + delete root_node; + delete root_module; + root_module = parsefile(outfilename); if (!root_module) { fprintf(stderr, "Error: Unable to read back dumped file\n"); @@ -159,6 +162,9 @@ int main(int argc, char **argv) exit(1); } + delete root_node; + delete root_module; + Builtins::instance(true); return rc; diff --git a/tests/echotest.cc b/tests/echotest.cc index 2f7ae4c..afa3d03 100644 --- a/tests/echotest.cc +++ b/tests/echotest.cc @@ -124,6 +124,9 @@ int main(int argc, char **argv) AbstractNode::resetIndexCounter(); root_node = root_module->evaluate(&root_ctx, &root_inst); + delete root_node; + delete root_module; + Builtins::instance(true); ofile.close(); return rc; diff --git a/valgrind.supp b/valgrind.supp index e6aaa59..261b977 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -39,3 +39,14 @@ fun:(below main) } +{ + Qt misc leaks + Memcheck:Leak + fun:calloc + ... + fun:_Z7qt_initP19QApplicationPrivatei + fun:_ZN19QApplicationPrivate9constructEv + fun:_ZN12QApplicationC2ERiPPcbi + fun:main +} + |