|
@@ -5449,7 +5449,8 @@ test_config_dup_and_filter(void *arg)
|
|
|
/* If we're not configured to be a bridge, but we set
|
|
|
* BridgeDistribution, then options_validate () should return -1. */
|
|
|
static void
|
|
|
-test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
|
|
|
+test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
|
|
|
+{
|
|
|
or_options_t* options = get_options_mutable();
|
|
|
or_options_t* old_options = options;
|
|
|
or_options_t* default_options = options;
|
|
@@ -5470,7 +5471,8 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
|
|
|
|
|
|
/* If the BridgeDistribution setting was valid, 0 should be returned. */
|
|
|
static void
|
|
|
-test_config_check_bridge_distribution_setting_valid(void *arg) {
|
|
|
+test_config_check_bridge_distribution_setting_valid(void *arg)
|
|
|
+{
|
|
|
int ret = check_bridge_distribution_setting("https");
|
|
|
|
|
|
(void)arg;
|
|
@@ -5482,11 +5484,16 @@ test_config_check_bridge_distribution_setting_valid(void *arg) {
|
|
|
|
|
|
/* If the BridgeDistribution setting was invalid, -1 should be returned. */
|
|
|
static void
|
|
|
-test_config_check_bridge_distribution_setting_invalid(void *arg) {
|
|
|
- int ret = check_bridge_distribution_setting("hyphens-are-not-allowed");
|
|
|
+test_config_check_bridge_distribution_setting_invalid(void *arg)
|
|
|
+{
|
|
|
+ int ret = check_bridge_distribution_setting("hyphens-are-allowed");
|
|
|
|
|
|
(void)arg;
|
|
|
|
|
|
+ tt_int_op(ret, OP_EQ, 0);
|
|
|
+
|
|
|
+ ret = check_bridge_distribution_setting("asterisks*are*forbidden");
|
|
|
+
|
|
|
tt_int_op(ret, OP_EQ, -1);
|
|
|
done:
|
|
|
return;
|
|
@@ -5495,7 +5502,8 @@ test_config_check_bridge_distribution_setting_invalid(void *arg) {
|
|
|
/* If the BridgeDistribution setting was unrecognised, a warning should be
|
|
|
* logged and 0 should be returned. */
|
|
|
static void
|
|
|
-test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
|
|
|
+test_config_check_bridge_distribution_setting_unrecognised(void *arg)
|
|
|
+{
|
|
|
int ret = check_bridge_distribution_setting("unicorn");
|
|
|
|
|
|
(void)arg;
|