diff options
| -rwxr-xr-x | ctdb/Makefile.in | 8 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_tool_libctdb.c (renamed from ctdb/tests/src/ctdb_parse_nodestring.c) | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in index 2dd2bb7fb45..6fdd3f6c3de 100755 --- a/ctdb/Makefile.in +++ b/ctdb/Makefile.in @@ -84,7 +84,7 @@ TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_fetch_one \ tests/bin/ctdb_randrec tests/bin/ctdb_persistent \ tests/bin/ctdb_traverse tests/bin/rb_test tests/bin/ctdb_transaction \ tests/bin/ctdb_takeover_tests tests/bin/ctdb_update_record \ - tests/bin/ctdb_parse_nodestring \ + tests/bin/ctdb_tool_libctdb \ @INFINIBAND_BINS@ BINS = bin/ctdb @CTDB_SCSI_IO@ bin/smnotify bin/ping_pong bin/ltdbtool @CTDB_PMDA@ @@ -248,11 +248,11 @@ tests/bin/ctdb_takeover_tests: $(CTDB_TEST_OBJ) tests/src/ctdb_takeover_tests.o @echo Linking $@ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_takeover_tests.o $(CTDB_TEST_OBJ) $(LIB_FLAGS) -tests/src/ctdb_parse_nodestring.o: tests/src/ctdb_parse_nodestring.c tests/src/libctdb_test.c $(CTDB_TEST_C) +tests/src/ctdb_tool_libctdb.o: tests/src/ctdb_tool_libctdb.c tests/src/libctdb_test.c $(CTDB_TEST_C) -tests/bin/ctdb_parse_nodestring: $(CTDB_TEST_OBJ) tests/src/ctdb_parse_nodestring.o +tests/bin/ctdb_tool_libctdb: $(CTDB_TEST_OBJ) tests/src/ctdb_tool_libctdb.o @echo Linking $@ - @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_parse_nodestring.o $(CTDB_TEST_OBJ) @POPT_OBJ@ $(LIB_FLAGS) + @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_libctdb.o $(CTDB_TEST_OBJ) @POPT_OBJ@ $(LIB_FLAGS) tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o @echo Linking $@ diff --git a/ctdb/tests/src/ctdb_parse_nodestring.c b/ctdb/tests/src/ctdb_tool_libctdb.c index e467c36870a..6d66054566a 100644 --- a/ctdb/tests/src/ctdb_parse_nodestring.c +++ b/ctdb/tests/src/ctdb_tool_libctdb.c @@ -1,5 +1,5 @@ /* - Tests for tools/ctdb.c:parse_nodestring() + Tests for tools/ctdb.c and libctdb stubs Copyright (C) Martin Schwenke 2011 @@ -90,7 +90,8 @@ static void test_parse_nodestring(const char *nodestring_s, libctdb_test_read_nodemap(ctdb); - if (parse_nodestring(NULL, nodestring, dd_ok, &nodes, &pnn_mode)) { + if (parse_nodestring(NULL, nodestring, CTDB_CURRENT_NODE, dd_ok, + &nodes, &pnn_mode)) { print_nodes(nodes, pnn_mode); } |