Commit 9bc4b0ac authored by Shane Snyder's avatar Shane Snyder

more cleanup of source and tests

parent 0c00ccec
...@@ -42,4 +42,5 @@ include Make.rules ...@@ -42,4 +42,5 @@ include Make.rules
include $(top_srcdir)/src/Makefile.subdir include $(top_srcdir)/src/Makefile.subdir
include $(top_srcdir)/tests/Makefile.subdir include $(top_srcdir)/tests/Makefile.subdir
include $(top_srcdir)/tests/proxy/Makefile.subdir
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
struct options struct options
{ {
char *listen_addr; char *listen_addr_str;
char *pmem_pool; char *pmem_pool;
char *host_file; char *host_file;
}; };
...@@ -54,7 +54,7 @@ static void parse_args(int argc, char **argv, struct options *opts) ...@@ -54,7 +54,7 @@ static void parse_args(int argc, char **argv, struct options *opts)
usage(argc, argv); usage(argc, argv);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
opts->listen_addr = argv[optind++]; opts->listen_addr_str = argv[optind++];
opts->pmem_pool = argv[optind++]; opts->pmem_pool = argv[optind++];
return; return;
...@@ -70,7 +70,7 @@ int main(int argc, char **argv) ...@@ -70,7 +70,7 @@ int main(int argc, char **argv)
/* start margo */ /* start margo */
/* use the main xstream for driving progress and executing rpc handlers */ /* use the main xstream for driving progress and executing rpc handlers */
mid = margo_init(opts.listen_addr, MARGO_SERVER_MODE, 0, -1); mid = margo_init(opts.listen_addr_str, MARGO_SERVER_MODE, 0, -1);
if(mid == MARGO_INSTANCE_NULL) if(mid == MARGO_INSTANCE_NULL)
{ {
fprintf(stderr, "Error: margo_init()\n"); fprintf(stderr, "Error: margo_init()\n");
......
...@@ -14,7 +14,7 @@ sleep 1 ...@@ -14,7 +14,7 @@ sleep 1
##################### #####################
# tear down # tear down
run_to 10 src/bb-shutdown $svr1 &> /dev/null run_to 10 src/bb-shutdown $svr1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
wait wait
exit 1 exit 1
......
...@@ -15,7 +15,7 @@ test_start_servers 1 2 20 ...@@ -15,7 +15,7 @@ test_start_servers 1 2 20
echo "Hello world." > $TMPBASE/foo.dat echo "Hello world." > $TMPBASE/foo.dat
CPOUT=`run_to 10 src/bb-copy-to $TMPBASE/foo.dat $svr1` CPOUT=`run_to 10 src/bb-copy-to $TMPBASE/foo.dat $svr1`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
run_to 10 src/bb-shutdown $svr1 &> /dev/null run_to 10 src/bb-shutdown $svr1
wait wait
exit 1 exit 1
fi fi
...@@ -23,7 +23,7 @@ fi ...@@ -23,7 +23,7 @@ fi
RID=`echo "$CPOUT" | grep -o -P '/tmp.*$'` RID=`echo "$CPOUT" | grep -o -P '/tmp.*$'`
run_to 10 src/bb-copy-from $svr1 $RID $TMPBASE/foo-out.dat run_to 10 src/bb-copy-from $svr1 $RID $TMPBASE/foo-out.dat
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
run_to 10 src/bb-shutdown $svr1 &> /dev/null run_to 10 src/bb-shutdown $svr1
wait wait
exit 1 exit 1
fi fi
...@@ -34,7 +34,7 @@ sleep 1 ...@@ -34,7 +34,7 @@ sleep 1
##################### #####################
# tear down # tear down
run_to 10 src/bb-shutdown $svr1 &> /dev/null run_to 10 src/bb-shutdown $svr1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
wait wait
exit 1 exit 1
......
...@@ -17,8 +17,6 @@ export TMPDIR ...@@ -17,8 +17,6 @@ export TMPDIR
mkdir -p $TMPDIR mkdir -p $TMPDIR
TMPBASE=$(${MKTEMP} --tmpdir -d test-XXXXXX) TMPBASE=$(${MKTEMP} --tmpdir -d test-XXXXXX)
echo "tmpbase: $TMPBASE"
if [ ! -d $TMPBASE ]; if [ ! -d $TMPBASE ];
then then
echo "Temp directory doesn't exist: $TMPBASE" echo "Temp directory doesn't exist: $TMPBASE"
......
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