Commit d1632836 authored by Matthieu Dorier's avatar Matthieu Dorier

resolved conflicts

parents c1d1362c 0cfa0045
......@@ -31,4 +31,3 @@ include Make.rules
include $(top_srcdir)/src/Makefile.subdir
include $(top_srcdir)/tests/Makefile.subdir
include $(top_srcdir)/tests/io-chain/Makefile.subdir
......@@ -12,6 +12,8 @@ int mobject_store_ioctx_create(
const char * pool_name,
mobject_store_ioctx_t *ioctx)
{
(void)pool_name; /* XXX pool is ignored for now and instead use one global "pool" */
*ioctx = (mobject_store_ioctx_t)calloc(1, sizeof(**ioctx));
(*ioctx)->pool_name = strdup(pool_name);
(*ioctx)->cluster = cluster;
......
......@@ -4,7 +4,6 @@ TESTS_ENVIRONMENT += \
check_PROGRAMS += \
tests/mobject-connect-test \
tests/sds-keyval-client-test \
tests/mobject-client-test
# don't include rados programs in make check
......@@ -14,7 +13,13 @@ noinst_PROGRAMS += \
endif
TESTS += \
tests/mobject-connect-test.sh
tests/mobject-connect-test.sh \
tests/mobject-client-test.sh
EXTRA_DIST += \
tests/mobject-connect-test.sh \
tests/mobject-client-test.sh \
tests/mobject-test-util.sh
tests_mobject_connect_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS}
if HAVE_RADOS
......@@ -25,5 +30,3 @@ endif
tests_mobject_client_test_LDADD = src/client/libmobject-store.la ${CLIENT_LIBS}
tests_sds_keyval_client_test_LDADD = ${SERVER_LIBS}
......@@ -137,7 +137,7 @@ int main(int argc, char** argv)
// print the results of the read operations
printf("Client received the following results:\n");
printf("stat: psize=%ld pmtime=%lld prval=%d\n", psize, pmtime, prval1);
printf("stat: psize=%ld pmtime=%lld prval=%d\n", psize, (long long)pmtime, prval1);
printf("read: bytes_read=%ld prval=%d\n", bytes_read, prval2);
printf("omap_get_keys: prval=%d\n", prval3);
printf("omap_get_vals: prval=%d\n", prval4);
......
#!/bin/bash -x
if [ -z $srcdir ]; then
echo srcdir variable not set.
exit 1
fi
if [ -z "$MKTEMP" ] ; then
echo expected MKTEMP variable defined to its respective command
exit 1
fi
source $srcdir/tests/mobject-test-util.sh
TEST_DIR=`$MKTEMP -d /tmp/mobject-connect-test-XXXXXX`
MOBJECT_CLUSTER_FILE=$TEST_DIR/cluster.gid
##############
# start 1 server with 2 second wait, 20s timeout
mobject_test_start_servers 1 2 20 $MOBJECT_CLUSTER_FILE
##############
# export some mobject client env variables
export MOBJECT_CLUSTER_FILE
export MOBJECT_SHUTDOWN_KILL_SERVERS=true
# run a mobject test client
run_to 10 tests/mobject-client-test
if [ $? -ne 0 ]; then
wait
exit 1
fi
##############
wait
# cleanup
rm -rf $TEST_DIR
exit 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment