summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/integration-tests/confs/c_bootstrap_server.conf2
-rw-r--r--src/integration-tests/confs/c_nat_client.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_2.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_http_2.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix.conf2
-rw-r--r--src/integration-tests/confs/c_no_nat_client_unix_2.conf2
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp.conf2
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp.conf2
-rw-r--r--src/integration-tests/confs/c_normal_client_tcp_udp_http.conf2
10 files changed, 10 insertions, 10 deletions
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 385229708..40653542e 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ confs/test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[PATHS]
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index eeee520ee..cee8b98cc 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[arm]
UNIXPATH = /tmp/test-service-arm-46
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 6f3c73c90..f254bcdd8 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ confs/test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client/
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index 9fa6c4f33..d399079e1 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[arm]
UNIXPATH = /tmp/test-service-arm-32
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf
index 761d6c0c9..0e4abd3d0 100644
--- a/src/integration-tests/confs/c_no_nat_client_http_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[arm]
DEFAULTSERVICES = topology hostlist fs core
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf
index 1ae4673f8..bd6208ed3 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[arm]
DEFAULTSERVICES = topology hostlist fs core
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
index d29f67876..724f4fb7e 100644
--- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[arm]
DEFAULTSERVICES = topology hostlist fs core
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
index 7fcf956cd..204e7ffd2 100644
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[arm]
UNIXPATH = /tmp/test-service-arm-46
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
index 6db51d57c..6abaf5917 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[arm]
UNIXPATH = /tmp/test-service-arm-46
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
index 82c5abb84..8b3b2b663 100644
--- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
+++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
@@ -1,4 +1,4 @@
-@INCLUDE@ test_defaults.conf
+@INLINE@ confs/test_defaults.conf
[arm]
UNIXPATH = /tmp/test-service-arm-46