diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-11-03 14:01:30 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-11-03 14:01:30 +0100 |
| commit | fd8d0562eb47f48bd5cabbb3690c56c0ebb93ce7 (patch) | |
| tree | 30b9988932a4eb465ab2fb867f29f292c2bcad38 | |
| parent | 212b3e671316c7c3e78ae0e7e00e99328137e857 (diff) | |
| download | NetworkManager-fd8d0562eb47f48bd5cabbb3690c56c0ebb93ce7.tar.gz | |
test-link: skip test if iproute2 is not capable enough
Older iproute2 as shipped with Ubuntu 14 doesn't support vxlan dstport.
| -rw-r--r-- | src/platform/tests/test-link.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c index e52e98723b..5b9355d04d 100644 --- a/src/platform/tests/test-link.c +++ b/src/platform/tests/test-link.c @@ -687,10 +687,16 @@ test_software_detect (gconstpointer user_data) case NM_LINK_TYPE_VXLAN: switch (test_data->test_mode) { case 0: - nmtstp_run_command_check ("ip link add %s type vxlan id 42 local 23.1.2.164 group 239.1.2.134 dev %s ageing 1245 dstport 4789", DEVICE_NAME, PARENT_NAME); + if (nmtstp_run_command ("ip link add %s type vxlan id 42 local 23.1.2.164 group 239.1.2.134 dev %s ageing 1245 dstport 4789", DEVICE_NAME, PARENT_NAME)) { + g_test_skip ("could not add a vxlan"); + goto out_delete_parent; + } break; case 1: - nmtstp_run_command_check ("ip link add %s type vxlan id 11214423 local 1:2:3:4:334:23::23 group ff0e::115 dev %s ageing 3245 dstport 57412", DEVICE_NAME, PARENT_NAME); + if (nmtstp_run_command ("ip link add %s type vxlan id 11214423 local 1:2:3:4:334:23::23 group ff0e::115 dev %s ageing 3245 dstport 57412", DEVICE_NAME, PARENT_NAME)) { + g_test_skip ("could not add a vxlan"); + goto out_delete_parent; + } break; } break; |