* @brief testcase for resolver_api.c
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_resolver_service.h"
#include "resolver.h"
{
int ok = 1 + 2 + 4 + 8;
char *fn;
- char *pfx;
struct GNUNET_OS_Process *proc;
- char *const argvx[] = {
+ char *const argvx[] = {
"test-resolver-api", "-c", "test_resolver_api_data.conf", NULL
};
struct GNUNET_GETOPT_CommandLineOption options[] =
GNUNET_log_setup ("test-resolver-api",
"WARNING",
NULL);
- pfx = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_BINDIR);
- GNUNET_asprintf (&fn, "%s%cgnunet-service-resolver", pfx, DIR_SEPARATOR);
- GNUNET_free (pfx);
- proc = GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, fn, "gnunet-service-resolver",
+ fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
+ proc = GNUNET_OS_start_process (GNUNET_YES,
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, NULL, fn,
+ "gnunet-service-resolver",
"-c", "test_resolver_api_data.conf", NULL);
GNUNET_assert (NULL != proc);
GNUNET_free (fn);
GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
argvx, "test-resolver-api", "nohelp",
options, &run, &ok));
- if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
ok = 1;