summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2013-04-24 11:10:04 -0400
committerKeith Bostic <keith@wiredtiger.com>2013-04-24 11:11:15 -0400
commitf2f60b5a78fd5c04e17eaa03753f81aff5bbec7e (patch)
treecc447aed9056e5256e2440523eb0854f77ae8af3
parentb95a8743db255f59faf8e9854313e6115fe826c5 (diff)
downloadmongo-f2f60b5a78fd5c04e17eaa03753f81aff5bbec7e.tar.gz
Report the version we want on failure.
-rw-r--r--ext/test/memrata/Makefile.am4
-rw-r--r--ext/test/memrata/memrata.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/ext/test/memrata/Makefile.am b/ext/test/memrata/Makefile.am
index 8302ffae5ab..1962680d3fe 100644
--- a/ext/test/memrata/Makefile.am
+++ b/ext/test/memrata/Makefile.am
@@ -1,10 +1,10 @@
AM_CPPFLAGS = -I$(top_builddir) \
- -I$(top_srcdir)/src/include -I$(MEMRATA_PATH)/include
+ -I$(top_srcdir)/src/include -I$(MEMRATA_PATH)
noinst_LTLIBRARIES = libwiredtiger_memrata.la
libwiredtiger_memrata_la_SOURCES = memrata.c
libwiredtiger_memrata_la_LIBADD = \
- -L$(MEMRATA_PATH)/lib -lkvs -L$(BERKELEY_DB_PATH)/lib -ldb
+ -L$(MEMRATA_PATH) -lkvs -L$(BERKELEY_DB_PATH)/lib -ldb
# libtool hack: noinst_LTLIBRARIES turns off building shared libraries as well
# as installation, it will only build static libraries. As far as I can tell,
diff --git a/ext/test/memrata/memrata.c b/ext/test/memrata/memrata.c
index 0a88de187d7..c9bbce8bb83 100644
--- a/ext/test/memrata/memrata.c
+++ b/ext/test/memrata/memrata.c
@@ -1265,7 +1265,8 @@ wiredtiger_extension_init(WT_CONNECTION *connection, WT_CONFIG_ARG *config)
/* Check the library version */
#if KVS_VERSION_MAJOR != 2 || KVS_VERSION_MINOR != 6
ERET(NULL, EINVAL,
- "interface code only supports KVS library version 2.6");
+ "interface code only supports KVS library version %d.%d",
+ KVS_VERSION_MAJOR, KVS_VERSION_MINOR);
#endif
/* Initialize the WT_DATA_SOURCE structure. */