MPT basic: append config, don't hardcode network

If a firewall blocks traffic over one network but not another, and the
one happens to be the default pick of Cyclone, then the MPT basic tests
won't work properly.

With the recent changes to the configuration handling for supporting
multiple sources of configuration, it makes far more sense to remove the
hardcoded network interface selection in the test configurations and to
append the test configuration file to the environment list rather than
to replace it.

Signed-off-by: Erik Boasson <eb@ilities.com>

src/mpt/tests/basic/etc/config_any.xml

@@ -14,7 +14,6 @@
     <Id>any</Id>
   </Domain>
   <General>
-    <NetworkInterfaceAddress>auto</NetworkInterfaceAddress>
     <AllowMulticast>true</AllowMulticast>
     <EnableMulticastLoopback>true</EnableMulticastLoopback>
   </General>

src/mpt/tests/basic/etc/config_specific.xml

@@ -14,7 +14,6 @@
     <Id>${DOMAIN_ID}</Id>
   </Domain>
   <General>
-   <NetworkInterfaceAddress>auto</NetworkInterfaceAddress>
     <AllowMulticast>true</AllowMulticast>
     <EnableMulticastLoopback>true</EnableMulticastLoopback>
   </General>

src/mpt/tests/basic/helloworld.c

@@ -13,13 +13,13 @@
 /* Environments */
 static mpt_env_t environment_any[] = {
     { "ETC_DIR",        MPT_SOURCE_ROOT_DIR"/tests/basic/etc"   },
-    { "CYCLONEDDS_URI", "file://${ETC_DIR}/config_any.xml"      },
+    { "CYCLONEDDS_URI", "${CYCLONEDDS_URI},file://${ETC_DIR}/config_any.xml" },
     { NULL,             NULL                                    }
 };
 static mpt_env_t environment_42[] = {
     { "ETC_DIR",        MPT_SOURCE_ROOT_DIR"/tests/basic/etc"   },
     { "DOMAIN_ID",      "42"                                    },
-    { "CYCLONEDDS_URI", "file://${ETC_DIR}/config_specific.xml" },
+    { "CYCLONEDDS_URI", "${CYCLONEDDS_URI},file://${ETC_DIR}/config_specific.xml" },
     { NULL,             NULL                                    }
 };