aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-01-21 19:25:12 +0100
committerChristian Grothoff <christian@grothoff.org>2018-01-21 19:25:12 +0100
commit8013c4b66a1926a9f49673a125f9822bf40dbd94 (patch)
treea6c27b48c470af4287b6ff62bfd0ef535a0a2f87
parent3f930c0f6aadc68c98fbe5f2b4824db9a61fc62a (diff)
use CONFIG_FILE macro
-rw-r--r--src/exchange-lib/test_exchange_api_new.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/exchange-lib/test_exchange_api_new.c b/src/exchange-lib/test_exchange_api_new.c
index 2bbbe0cda..49934fcd3 100644
--- a/src/exchange-lib/test_exchange_api_new.c
+++ b/src/exchange-lib/test_exchange_api_new.c
@@ -82,6 +82,10 @@ do_shutdown (void *cls)
}
}
+#define CONFIG_FILE "test_exchange_api.conf"
+
+#define RUN_WIREWATCH(label) TALER_TESTING_cmd_exec_wirewatch (label, CONFIG_FILE)
+
/**
* Main function that will tell the interpreter what to do.
@@ -99,8 +103,7 @@ run (void *cls,
EXCHANGE_ACCOUNT_NO,
"user42",
"pass42"),
- TALER_TESTING_cmd_exec_wirewatch ("exec-wirewatch",
- "test_exchange_api.conf"),
+ RUN_WIREWATCH ("exec-wirewatch-1"),
TALER_TESTING_cmd_end ()
};
@@ -129,8 +132,8 @@ main (int argc,
GNUNET_log_setup ("test-exchange-api-new",
"INFO",
NULL);
- TALER_TESTING_cleanup_files ("test_exchange_api.conf");
- result = TALER_TESTING_prepare_exchange ("test_exchange_api.conf");
+ TALER_TESTING_cleanup_files (CONFIG_FILE);
+ result = TALER_TESTING_prepare_exchange (CONFIG_FILE);
if (GNUNET_SYSERR == result)
return 1;
if (GNUNET_NO == result)
@@ -152,7 +155,7 @@ main (int argc,
NULL, NULL, NULL,
"taler-exchange-httpd",
"taler-exchange-httpd",
- "-c", "test_exchange_api.conf",
+ "-c", CONFIG_FILE,
"-i",
NULL);
/* give child time to start and bind against the socket */