summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-04-11 14:47:07 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-04-11 17:27:13 +0200
commita1fdd544063dfc317edd669451679ee597e24f09 (patch)
tree2626f1ee6c60c062401957c73a3c92764a58c450
parentad5dced6023f0ffb0f89ab3be5b29dd7bf25201e (diff)
downloadNetworkManager-bg/meson-tests.tar.gz
build: meson: add prefix to test namesbg/meson-tests
There are multiple tests with the same in different directories; add a unique prefix to test names so that it is clear from the output which one is running.
-rw-r--r--clients/common/tests/meson.build2
-rw-r--r--dispatcher/tests/meson.build2
-rw-r--r--libnm-core/tests/meson.build2
-rw-r--r--libnm-glib/tests/meson.build2
-rw-r--r--libnm-util/tests/meson.build2
-rw-r--r--libnm/tests/meson.build2
-rw-r--r--src/devices/tests/meson.build2
-rw-r--r--src/devices/wifi/tests/meson.build2
-rw-r--r--src/dhcp/tests/meson.build2
-rw-r--r--src/dnsmasq/tests/meson.build2
-rw-r--r--src/ndisc/tests/meson.build2
-rw-r--r--src/platform/tests/meson.build2
-rw-r--r--src/settings/plugins/ibft/tests/meson.build2
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/meson.build2
-rw-r--r--src/settings/plugins/ifupdown/tests/meson.build2
-rw-r--r--src/settings/plugins/keyfile/tests/meson.build2
-rw-r--r--src/supplicant/tests/meson.build2
-rw-r--r--src/tests/config/meson.build2
-rw-r--r--src/tests/meson.build4
19 files changed, 20 insertions, 20 deletions
diff --git a/clients/common/tests/meson.build b/clients/common/tests/meson.build
index faddd808cd..cc357cdc8c 100644
--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@@ -17,7 +17,7 @@ exe = executable(
)
test(
- test_unit,
+ 'clients/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build
index b2568ce301..1368a1f33c 100644
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@@ -21,7 +21,7 @@ exe = executable(
)
test(
- test_unit,
+ 'dispatcher/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/libnm-core/tests/meson.build b/libnm-core/tests/meson.build
index a76cda0eb9..6e8a2493d8 100644
--- a/libnm-core/tests/meson.build
+++ b/libnm-core/tests/meson.build
@@ -44,7 +44,7 @@ foreach test_unit: test_units
link_with: libnm_core
)
test(
- test_unit,
+ 'libnm-core/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/libnm-glib/tests/meson.build b/libnm-glib/tests/meson.build
index d6f872b9a0..029b3c20c5 100644
--- a/libnm-glib/tests/meson.build
+++ b/libnm-glib/tests/meson.build
@@ -23,7 +23,7 @@ foreach test_unit: test_units
)
test(
- test_unit,
+ 'libnm-glib/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build
index b6f67ef463..63535033f1 100644
--- a/libnm-util/tests/meson.build
+++ b/libnm-util/tests/meson.build
@@ -40,7 +40,7 @@ foreach test_unit: test_units
)
test(
- 'libnm-util-' + test_unit[0],
+ 'libnm-util/' + test_unit[0],
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index d5f7953d15..c47814b336 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -26,7 +26,7 @@ foreach test_unit: test_units
)
test(
- 'libnm-' + test_unit[0],
+ 'libnm/' + test_unit[0],
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/devices/tests/meson.build b/src/devices/tests/meson.build
index 9216b81486..64afc278d6 100644
--- a/src/devices/tests/meson.build
+++ b/src/devices/tests/meson.build
@@ -11,7 +11,7 @@ foreach test_unit: test_units
)
test(
- test_unit,
+ 'devices/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/devices/wifi/tests/meson.build b/src/devices/wifi/tests/meson.build
index 1b087f6e85..bb8f7c27f2 100644
--- a/src/devices/wifi/tests/meson.build
+++ b/src/devices/wifi/tests/meson.build
@@ -7,7 +7,7 @@ exe = executable(
)
test(
- test_unit,
+ 'devices/wifi/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/dhcp/tests/meson.build b/src/dhcp/tests/meson.build
index 533cde5eaa..32badae8bc 100644
--- a/src/dhcp/tests/meson.build
+++ b/src/dhcp/tests/meson.build
@@ -12,7 +12,7 @@ foreach test_unit: test_units
)
test(
- test_unit,
+ 'dhcp/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/dnsmasq/tests/meson.build b/src/dnsmasq/tests/meson.build
index 5b4946d94b..40f42f6f80 100644
--- a/src/dnsmasq/tests/meson.build
+++ b/src/dnsmasq/tests/meson.build
@@ -8,7 +8,7 @@ exe = executable(
)
test(
- test_unit,
+ 'dnsmasq/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/ndisc/tests/meson.build b/src/ndisc/tests/meson.build
index d2d83d07d9..2f479c2d9f 100644
--- a/src/ndisc/tests/meson.build
+++ b/src/ndisc/tests/meson.build
@@ -8,7 +8,7 @@ exe = executable(
)
test(
- test_unit,
+ 'ndisc/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build
index efba349ba4..0571efacff 100644
--- a/src/platform/tests/meson.build
+++ b/src/platform/tests/meson.build
@@ -20,7 +20,7 @@ foreach test_unit: test_units
)
test(
- 'platform-' + test_unit[0],
+ 'platform/' + test_unit[0],
test_script,
timeout: test_unit.length() > 2 ? test_unit[2] : 30,
args: test_args + [exe.full_path()]
diff --git a/src/settings/plugins/ibft/tests/meson.build b/src/settings/plugins/ibft/tests/meson.build
index 0f07d6989d..7a9445dd8a 100644
--- a/src/settings/plugins/ibft/tests/meson.build
+++ b/src/settings/plugins/ibft/tests/meson.build
@@ -16,7 +16,7 @@ exe = executable(
)
test(
- test_unit,
+ 'ibft/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/settings/plugins/ifcfg-rh/tests/meson.build b/src/settings/plugins/ifcfg-rh/tests/meson.build
index aeb29118b4..3596b642c9 100644
--- a/src/settings/plugins/ifcfg-rh/tests/meson.build
+++ b/src/settings/plugins/ifcfg-rh/tests/meson.build
@@ -16,7 +16,7 @@ exe = executable(
)
test(
- test_unit,
+ 'ifcfg-rh/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/settings/plugins/ifupdown/tests/meson.build b/src/settings/plugins/ifupdown/tests/meson.build
index e96add7e5a..7f210034b8 100644
--- a/src/settings/plugins/ifupdown/tests/meson.build
+++ b/src/settings/plugins/ifupdown/tests/meson.build
@@ -11,7 +11,7 @@ exe = executable(
)
test(
- test_unit,
+ 'ifupdown/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/settings/plugins/keyfile/tests/meson.build b/src/settings/plugins/keyfile/tests/meson.build
index bdbfc62a80..54b4ee0d9d 100644
--- a/src/settings/plugins/keyfile/tests/meson.build
+++ b/src/settings/plugins/keyfile/tests/meson.build
@@ -15,7 +15,7 @@ exe = executable(
)
test(
- test_unit,
+ 'keyfile/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/supplicant/tests/meson.build b/src/supplicant/tests/meson.build
index a980409840..e6a86b20b4 100644
--- a/src/supplicant/tests/meson.build
+++ b/src/supplicant/tests/meson.build
@@ -8,7 +8,7 @@ exe = executable(
)
test(
- test_unit,
+ 'supplicant/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/tests/config/meson.build b/src/tests/config/meson.build
index 6f63c8a150..fb40d9a971 100644
--- a/src/tests/config/meson.build
+++ b/src/tests/config/meson.build
@@ -20,7 +20,7 @@ exe = executable(
)
test(
- test_unit,
+ 'config/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 71e8bfa258..386ede8782 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -18,7 +18,7 @@ foreach test_unit: test_units
)
test(
- test_unit,
+ 'src/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)
@@ -41,7 +41,7 @@ exe = executable(
)
test(
- test_unit,
+ 'src/' + test_unit,
test_script,
args: test_args + [exe.full_path()]
)