From c99bbc99b086286c2c19d7bff7ceb001d7206fa9 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 19 May 2019 11:27:53 +0200
Subject: [PATCH] wifi/tests: rename Wi-Fi's "test-general" to
 "test-devices-wifi"

We already have 4 other tests that are named "test-general". Rename.
---
 .gitignore                                         |  3 ++-
 Makefile.am                                        | 14 +++++++-------
 src/devices/wifi/tests/meson.build                 |  6 +++---
 .../tests/{test-general.c => test-devices-wifi.c}  |  0
 4 files changed, 12 insertions(+), 11 deletions(-)
 rename src/devices/wifi/tests/{test-general.c => test-devices-wifi.c} (100%)

diff --git a/.gitignore b/.gitignore
index bd9acce872..ac6690412a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -205,7 +205,7 @@ test-*.trs
 /src/NetworkManager.ver
 /src/devices/tests/test-acd
 /src/devices/tests/test-lldp
-/src/devices/wifi/tests/test-general
+/src/devices/wifi/tests/test-devices-wifi
 /src/dhcp/nm-dhcp-helper
 /src/dhcp/tests/test-dhcp-dhclient
 /src/dhcp/tests/test-dhcp-options
@@ -305,6 +305,7 @@ test-*.trs
 /policy/org.freedesktop.NetworkManager.policy
 /policy/org.freedesktop.NetworkManager.policy.in
 /src/devices/tests/test-arping
+/src/devices/wifi/tests/test-general
 /src/devices/wifi/tests/test-wifi-ap-utils
 /src/dhcp-manager/nm-dhcp-helper
 /src/dhcp-manager/tests/test-dhcp-dhclient
diff --git a/Makefile.am b/Makefile.am
index 80fb5a0ddf..7926abd41e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3400,21 +3400,21 @@ check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la
 
 check_local += check-local-devices-wifi
 
-check_programs += src/devices/wifi/tests/test-general
+check_programs += src/devices/wifi/tests/test-devices-wifi
 
-src_devices_wifi_tests_test_general_SOURCES = \
-	src/devices/wifi/tests/test-general.c \
+src_devices_wifi_tests_test_devices_wifi_SOURCES = \
+	src/devices/wifi/tests/test-devices-wifi.c \
 	src/devices/wifi/nm-wifi-ap.c \
 	src/devices/wifi/nm-wifi-ap.h \
 	src/devices/wifi/nm-wifi-utils.c \
 	src/devices/wifi/nm-wifi-utils.h
 
-src_devices_wifi_tests_test_general_CPPFLAGS = $(src_cppflags_base_test)
+src_devices_wifi_tests_test_devices_wifi_CPPFLAGS = $(src_cppflags_base_test)
 
-src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la
-src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
+src_devices_wifi_tests_test_devices_wifi_LDADD = src/libNetworkManagerTest.la
+src_devices_wifi_tests_test_devices_wifi_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
 
-$(src_devices_wifi_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_devices_wifi_tests_test_devices_wifi_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 endif
 
diff --git a/src/devices/wifi/tests/meson.build b/src/devices/wifi/tests/meson.build
index 895853c4c0..ba756d531b 100644
--- a/src/devices/wifi/tests/meson.build
+++ b/src/devices/wifi/tests/meson.build
@@ -1,13 +1,13 @@
-test_unit = 'test-general'
+test_unit = 'test-devices-wifi'
 
 exe = executable(
-  'wifi-' + test_unit,
+  test_unit,
   [test_unit + '.c'] + common_sources,
   dependencies: test_nm_dep,
 )
 
 test(
-  'devices/wifi/' + test_unit,
+  test_unit,
   test_script,
   args: test_args + [exe.full_path()],
   timeout: default_test_timeout,
diff --git a/src/devices/wifi/tests/test-general.c b/src/devices/wifi/tests/test-devices-wifi.c
similarity index 100%
rename from src/devices/wifi/tests/test-general.c
rename to src/devices/wifi/tests/test-devices-wifi.c