summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-09-14 08:13:26 +0930
committerRusty Russell <rusty@rustcorp.com.au>2011-09-14 08:13:26 +0930
commit2dfa64c3c9dc9a0f9d6bbf19e4fb32a08ad87614 (patch)
tree2989bc7f3e9206990c284fa6742c76b14fe391dd /lib
parentc3f3cad9eb58b84a944e501aaede818d4225d057 (diff)
downloadsamba-2dfa64c3c9dc9a0f9d6bbf19e4fb32a08ad87614.tar.gz
samba-2dfa64c3c9dc9a0f9d6bbf19e4fb32a08ad87614.tar.bz2
samba-2dfa64c3c9dc9a0f9d6bbf19e4fb32a08ad87614.zip
tdb2: test: Speed up run-01-new_database.
Don't run tdb_check with failtest on, since it is very slow. Do the tdb_check w/ failtest in a new test, but skip MMAP suppression which doesn't add much and slows down valgrind a lot. Before this change run-01-new_database took 40 seconds (under valgrind), after it takes 8 seconds, and run-12-check takes 3 seconds). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (Imported from CCAN commit b3ae89992ecaffed31dcc2e912539c289478801a)
Diffstat (limited to 'lib')
-rw-r--r--lib/tdb2/test/run-01-new_database.c24
-rw-r--r--lib/tdb2/test/run-12-check.c61
2 files changed, 78 insertions, 7 deletions
diff --git a/lib/tdb2/test/run-01-new_database.c b/lib/tdb2/test/run-01-new_database.c
index 27d18ccc28..07a9703533 100644
--- a/lib/tdb2/test/run-01-new_database.c
+++ b/lib/tdb2/test/run-01-new_database.c
@@ -5,6 +5,17 @@
#include "logging.h"
#include "failtest_helper.h"
+static bool failtest_suppress = false;
+
+/* Don't need to test everything here, just want expand testing. */
+static enum failtest_result
+suppress_failure(struct failtest_call *history, unsigned num)
+{
+ if (failtest_suppress)
+ return FAIL_DONT_FAIL;
+ return block_repeat_failures(history, num);
+}
+
int main(int argc, char *argv[])
{
unsigned int i;
@@ -19,7 +30,7 @@ int main(int argc, char *argv[])
TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
failtest_init(argc, argv);
- failtest_hook = block_repeat_failures;
+ failtest_hook = suppress_failure;
failtest_exit_check = exit_check_log;
plan_tests(sizeof(flags) / sizeof(flags[0]) * 3);
for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
@@ -27,12 +38,11 @@ int main(int argc, char *argv[])
O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
if (!ok1(tdb))
failtest_exit(exit_status());
- if (tdb) {
- bool ok = ok1(tdb_check(tdb, NULL, NULL) == 0);
- tdb_close(tdb);
- if (!ok)
- failtest_exit(exit_status());
- }
+
+ failtest_suppress = true;
+ ok1(tdb_check(tdb, NULL, NULL) == 0);
+ failtest_suppress = false;
+ tdb_close(tdb);
if (!ok1(tap_log_messages == 0))
break;
}
diff --git a/lib/tdb2/test/run-12-check.c b/lib/tdb2/test/run-12-check.c
new file mode 100644
index 0000000000..f55b942cc5
--- /dev/null
+++ b/lib/tdb2/test/run-12-check.c
@@ -0,0 +1,61 @@
+#include <ccan/tdb2/private.h>
+#include <ccan/failtest/failtest_override.h>
+#include "tdb2-source.h"
+#include <ccan/tap/tap.h>
+#include <ccan/failtest/failtest.h>
+#include "logging.h"
+#include "failtest_helper.h"
+
+static bool failtest_suppress = false;
+
+/* Don't need to test everything here, just want expand testing. */
+static enum failtest_result
+suppress_failure(struct failtest_call *history, unsigned num)
+{
+ if (failtest_suppress)
+ return FAIL_DONT_FAIL;
+ return block_repeat_failures(history, num);
+}
+
+int main(int argc, char *argv[])
+{
+ unsigned int i;
+ struct tdb_context *tdb;
+ int flags[] = { TDB_INTERNAL,
+ TDB_INTERNAL|TDB_CONVERT,
+ TDB_CONVERT,
+ TDB_INTERNAL|TDB_VERSION1,
+ TDB_VERSION1,
+ TDB_INTERNAL|TDB_CONVERT|TDB_VERSION1,
+ TDB_CONVERT|TDB_VERSION1 };
+ struct tdb_data key = tdb_mkdata("key", 3);
+ struct tdb_data data = tdb_mkdata("data", 4);
+
+ failtest_init(argc, argv);
+ failtest_hook = suppress_failure;
+ failtest_exit_check = exit_check_log;
+
+ failtest_suppress = true;
+ plan_tests(sizeof(flags) / sizeof(flags[0]) * 3 + 1);
+ for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
+ tdb = tdb_open("run-10-simple-store.tdb", flags[i],
+ O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
+ ok1(tdb);
+ ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
+
+ /* This is what we really want to test: tdb_check(). */
+ failtest_suppress = false;
+ if (!ok1(tdb_check(tdb, NULL, NULL) == 0))
+ goto fail;
+ failtest_suppress = true;
+
+ tdb_close(tdb);
+ }
+ ok1(tap_log_messages == 0);
+ failtest_exit(exit_status());
+
+fail:
+ failtest_suppress = true;
+ tdb_close(tdb);
+ failtest_exit(exit_status());
+}