diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-06-01 22:52:34 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-06-01 22:52:34 +1000 |
| commit | 08bd42abc288c66ad77ba6face49798d898970b9 (patch) | |
| tree | 14934ecb20d4104b828d7d88cd67a0e24d0be64f | |
| parent | e8cf23c09bfde94a3d2ecfb9033126a48b52d394 (diff) | |
| download | mongo-08bd42abc288c66ad77ba6face49798d898970b9.tar.gz | |
Add test/fops and test/thread to "make check".
| -rw-r--r-- | test/fops/Makefile.am | 2 | ||||
| -rw-r--r-- | test/fops/t.c | 10 | ||||
| -rw-r--r-- | test/thread/Makefile.am | 2 | ||||
| -rw-r--r-- | test/thread/t.c | 12 |
4 files changed, 11 insertions, 15 deletions
diff --git a/test/fops/Makefile.am b/test/fops/Makefile.am index 17592c66307..5ad18e6c29b 100644 --- a/test/fops/Makefile.am +++ b/test/fops/Makefile.am @@ -5,5 +5,7 @@ t_LDADD = $(top_builddir)/libwiredtiger.la t_SOURCES = thread.h file.c fops.c t.c t_LDFLAGS = -static +TESTS = $(noinst_PROGRAMS) + clean-local: rm -rf WiredTiger* __* *.core diff --git a/test/fops/t.c b/test/fops/t.c index 07070ef403a..c2a47d5d864 100644 --- a/test/fops/t.c +++ b/test/fops/t.c @@ -36,13 +36,10 @@ main(int argc, char *argv[]) config_open = NULL; nops = 1000; nthreads = 10; - runs = 0; + runs = 1; - while ((ch = getopt(argc, argv, "1C:l:n:r:t:")) != EOF) + while ((ch = getopt(argc, argv, "C:l:n:r:t:")) != EOF) switch (ch) { - case '1': /* One run */ - runs = 1; - break; case 'C': /* wiredtiger_open config */ config_open = optarg; break; @@ -196,11 +193,10 @@ usage(void) { fprintf(stderr, "usage: %s " - "[-1S] [-C wiredtiger-config] [-k keys] [-l log]\n\t" + "[-S] [-C wiredtiger-config] [-k keys] [-l log]\n\t" "[-n ops] [-R readers] [-r runs] [-t f|r|v] [-W writers]\n", progname); fprintf(stderr, "%s", - "\t-1 run once\n" "\t-C specify wiredtiger_open configuration arguments\n" "\t-l specify a log file\n" "\t-n set number of operations each thread does\n" diff --git a/test/thread/Makefile.am b/test/thread/Makefile.am index efc0800c7b1..d43e13b2bbe 100644 --- a/test/thread/Makefile.am +++ b/test/thread/Makefile.am @@ -5,5 +5,7 @@ t_LDADD = $(top_builddir)/libwiredtiger.la t_SOURCES = thread.h file.c rw.c stats.c t.c t_LDFLAGS = -static +TESTS = $(noinst_PROGRAMS) + clean-local: rm -rf WiredTiger* __* *.core diff --git a/test/thread/t.c b/test/thread/t.c index 908dba1da1f..554c624073b 100644 --- a/test/thread/t.c +++ b/test/thread/t.c @@ -40,15 +40,12 @@ main(int argc, char *argv[]) nkeys = 1000; nops = 10000; readers = 10; - runs = 0; + runs = 1; session_per_op = 0; writers = 10; - while ((ch = getopt(argc, argv, "1C:k:l:n:R:r:St:W:")) != EOF) + while ((ch = getopt(argc, argv, "C:k:l:n:R:r:St:W:")) != EOF) switch (ch) { - case '1': /* One run */ - runs = 1; - break; case 'C': /* wiredtiger_open config */ config_open = optarg; break; @@ -238,17 +235,16 @@ usage(void) { fprintf(stderr, "usage: %s " - "[-1S] [-C wiredtiger-config] [-k keys] [-l log]\n\t" + "[-S] [-C wiredtiger-config] [-k keys] [-l log]\n\t" "[-n ops] [-R readers] [-r runs] [-t f|r|v] [-W writers]\n", progname); fprintf(stderr, "%s", - "\t-1 run once\n" "\t-C specify wiredtiger_open configuration arguments\n" "\t-k set number of keys to load\n" "\t-l specify a log file\n" "\t-n set number of operations each thread does\n" "\t-R set number of reading threads\n" - "\t-r set number of runs\n" + "\t-r set number of runs (0 for continuous)\n" "\t-S open/close a session on every operation\n" "\t-t set a file type (fix | row | var)\n" "\t-W set number of writing threads\n"); |