build: merge "src/settings/plugins/ifcfg-rh/tests/Makefile.am" into toplevel Makefile

7 files changed, 207 insertions, 220 deletions

diff --git a/Makefile.am b/Makefile.am
index 859a6e2e31..ea781d431e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,7 @@ pkglib_LTLIBRARIES =
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
+dist_hook =
 TESTS =
 BUILT_SOURCES =
 GLIB_GENERATED =
@@ -1808,8 +1809,208 @@ check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-setti
 
 check_local += check-local-symbols-settings-ifcfg-rh
 
+###############################################################################
+# src/settings/plugins/ifcfg-rh/tests
+###############################################################################
+
+check_programs += src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+
+src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
+	src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+
+src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
+	$(GLIB_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	-I$(top_srcdir)/src/ \
+	-I$(top_srcdir)/src/platform \
+	-I$(top_srcdir)/src/settings \
+	-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	-DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \
+	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\" \
+	-DSYSCONFDIR=\"nonexistent\" \
+	-DSBINDIR=\"nonexistent\"
+
+src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
+	$(GLIB_LIBS) \
+	$(CODE_COVERAGE_LDFLAGS)
+
+src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \
+	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
+	src/libNetworkManager.la
+
 endif
 
+EXTRA_DIST += \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-misc-variables \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-variables-corner-cases-1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled-unrecognized \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-unrecognized \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-plus-ip \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-shared-plus-ip \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp-send-hostname \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway-ignore \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway-ignore \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-obsolete-gateway-n \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-agent \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-tls-always \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1X-subj-matches \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-802-1x-ttls-eapgtc \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-noip \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-agent \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap-always-ask \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-hidden \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-a-channel-mismatch \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-band-bg-channel-mismatch \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-always \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-never \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-default \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-mac-random-missing \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-3 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv4-manual-4 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ctc-static \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-missing-stp \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-vlanid \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-only-device \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-physdev \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-agent-keys \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-dynamic-wep-leap \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-infiniband \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-main \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-slave-ib \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bond-mode-numeric \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-default-app-priorities \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-booleans \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-booleans \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-uints \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-uints \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-bad-percent \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-short-percent \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dcb-pgpct-not-100 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-fabric \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-fcoe-vn2vn \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-empty-config \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-trailing-spaces \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-dns-options \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-wake-on-lan \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only-1
+
+# make target dependencies can't have colons in their names, which ends up
+# meaning that we can't add the alias files to EXTRA_DIST. They are instead
+# dist'ed via dist-hook-settings-ifcfg-rh below.
+src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem0:99 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem1:1 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2 \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-aliasem2:1
+
+dist-hook-settings-ifcfg-rh-alias-files:
+	@for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \
+		cp $(abs_srcdir)/$$f $(distdir)/src/settings/plugins/ifcfg-rh/tests/network-scripts/; \
+	done
+
+dist_hook += dist-hook-settings-ifcfg-rh-alias-files
+
 ###############################################################################
 
 dbusservice_DATA += src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
@@ -1903,6 +2104,8 @@ CLEANFILES += \
 
 check-local: $(check_local)
 
+dist-hook: $(dist_hook)
+
 ###############################################################################
 
 install-data-hook:
@@ -1917,4 +2120,4 @@ cscope:
 
 ###############################################################################
 
-.PHONY: cscope $(check_local)
+.PHONY: cscope $(check_local) $(dist_hook)
diff --git a/configure.ac b/configure.ac
index cb2d5f03f7..d36f9a945c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1145,9 +1145,6 @@ src/settings/plugins/ifupdown/Makefile
 src/settings/plugins/ifupdown/tests/Makefile
 src/settings/plugins/ifnet/Makefile
 src/settings/plugins/ifnet/tests/Makefile
-src/settings/plugins/ifcfg-rh/Makefile
-src/settings/plugins/ifcfg-rh/tests/Makefile
-src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
 src/platform/Makefile
 src/platform/tests/Makefile
 src/rdisc/Makefile
diff --git a/src/settings/plugins/Makefile.am b/src/settings/plugins/Makefile.am
index c9ccbd47bd..ca6879dcd7 100644
--- a/src/settings/plugins/Makefile.am
+++ b/src/settings/plugins/Makefile.am
@@ -2,10 +2,6 @@ SUBDIRS=
 
 @GNOME_CODE_COVERAGE_RULES@
 
-if CONFIG_PLUGIN_IFCFG_RH
-SUBDIRS+=ifcfg-rh
-endif
-
 if CONFIG_PLUGIN_IFUPDOWN
 SUBDIRS+=ifupdown
 endif
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
deleted file mode 100644
index 3c6155b9c6..0000000000
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = tests
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
deleted file mode 100644
index 35f077b596..0000000000
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-if ENABLE_TESTS
-
-SUBDIRS=network-scripts
-
-@GNOME_CODE_COVERAGE_RULES@
-
-AM_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS) \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/platform \
-	-I$(top_srcdir)/src/settings \
-	-I$(srcdir)/../ \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
-	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
-	-DSYSCONFDIR=\"nonexistent\" \
-	-DSBINDIR=\"nonexistent\"
-
-AM_LDFLAGS = \
-	$(GLIB_LIBS) \
-	$(CODE_COVERAGE_LDFLAGS)
-
-noinst_PROGRAMS = test-ifcfg-rh
-
-test_ifcfg_rh_SOURCES = \
-	test-ifcfg-rh.c
-
-test_ifcfg_rh_LDADD = \
-	$(top_builddir)/src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \
-	$(top_builddir)/src/libNetworkManager.la
-
-@NM_LOG_COMPILER@
-TESTS = test-ifcfg-rh
-
-endif
diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
deleted file mode 100644
index de9c1ed73f..0000000000
--- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
+++ /dev/null
@@ -1,170 +0,0 @@
-EXTRA_DIST = \
-	ifcfg-test-minimal \
-	ifcfg-test-misc-variables \
-	ifcfg-test-variables-corner-cases-1 \
-	ifcfg-test-nm-controlled \
-	ifcfg-test-nm-controlled-unrecognized \
-	ifcfg-test-unrecognized \
-	ifcfg-test-wired-static \
-	ifcfg-test-wired-static-bootproto \
-	ifcfg-test-wired-dhcp \
-	ifcfg-test-wired-dhcp-plus-ip \
-	ifcfg-test-wired-shared-plus-ip \
-	ifcfg-test-wired-dhcp-send-hostname \
-	ifcfg-test-wired-dhcp6-only \
-	ifcfg-test-wired-autoip \
-	ifcfg-test-wired-global-gateway \
-	network-test-wired-global-gateway \
-	ifcfg-test-wired-global-gateway-ignore \
-	network-test-wired-global-gateway-ignore \
-	ifcfg-test-wired-obsolete-gateway-n \
-	ifcfg-test-wired-never-default \
-	network-test-wired-never-default \
-	ifcfg-test-wired-defroute-no \
-	ifcfg-test-wired-defroute-no-gatewaydev-yes \
-	network-test-wired-defroute-no-gatewaydev-yes \
-	ifcfg-test-wired-8021x-peap-mschapv2 \
-	keys-test-wired-8021x-peap-mschapv2 \
-	ifcfg-test-wired-8021x-tls-agent \
-	ifcfg-test-wired-8021x-tls-always \
-	ifcfg-test-wired-802-1X-subj-matches \
-	ifcfg-test-wired-802-1x-ttls-eapgtc \
-	ifcfg-test-onboot-no \
-	ifcfg-test-noip \
-	ifcfg-test-wifi-open \
-	ifcfg-test-wifi-open-auto \
-	ifcfg-test-wifi-open-ssid-quoted \
-	ifcfg-test-wifi-open-ssid-long-quoted \
-	ifcfg-test-wifi-open-ssid-hex \
-	ifcfg-test-wifi-open-ssid-long-hex \
-	ifcfg-test-wifi-open-ssid-bad-hex \
-	ifcfg-test-wifi-wep \
-	keys-test-wifi-wep \
-	ifcfg-test-wifi-wep-adhoc \
-	keys-test-wifi-wep-adhoc \
-	ifcfg-test-wifi-wep-eap-ttls-chap \
-	keys-test-wifi-wep-eap-ttls-chap \
-	ifcfg-test-wifi-leap \
-	keys-test-wifi-leap \
-	ifcfg-test-wifi-leap-agent \
-	ifcfg-test-wifi-leap-always-ask \
-	ifcfg-test-wifi-wpa-psk \
-	keys-test-wifi-wpa-psk \
-	ifcfg-test-wifi-wpa-psk-2 \
-	keys-test-wifi-wpa-psk-2 \
-	ifcfg-test-wifi-wpa-psk-unquoted \
-	keys-test-wifi-wpa-psk-unquoted \
-	ifcfg-test-wifi-wpa-psk-unquoted2 \
-	keys-test-wifi-wpa-psk-unquoted2 \
-	ifcfg-test-wifi-wpa-psk-adhoc \
-	keys-test-wifi-wpa-psk-adhoc \
-	ifcfg-test-wifi-wpa-psk-hex \
-	keys-test-wifi-wpa-psk-hex \
-	ifcfg-test-wifi-wpa-eap-tls \
-	keys-test-wifi-wpa-eap-tls \
-	ifcfg-test-wifi-wpa-eap-ttls-tls \
-	keys-test-wifi-wpa-eap-ttls-tls \
-	ifcfg-test-wifi-hidden \
-	ifcfg-test-wifi-band-a \
-	ifcfg-test-wifi-band-a-channel-mismatch \
-	ifcfg-test-wifi-band-bg-channel-mismatch \
-	ifcfg-test-wifi-mac-random-always \
-	ifcfg-test-wifi-mac-random-never \
-	ifcfg-test-wifi-mac-random-default \
-	ifcfg-test-wifi-mac-random-missing \
-	test_ca_cert.pem \
-	test1_key_and_cert.pem \
-	ifcfg-test-ibft \
-	ifcfg-test-static-routes-legacy \
-	route-test-static-routes-legacy \
-	ifcfg-test-sit-ignore \
-	ifcfg-test-wired-static-routes \
-	route-test-wired-static-routes \
-	ifcfg-test-wired-static-routes-legacy \
-	route-test-wired-static-routes-legacy \
-	ifcfg-test-wired-ipv4-manual-1 \
-	ifcfg-test-wired-ipv4-manual-2 \
-	ifcfg-test-wired-ipv4-manual-3 \
-	ifcfg-test-wired-ipv4-manual-4 \
-	ifcfg-test-wired-ipv6-manual \
-	route6-test-wired-ipv6-manual \
-	ifcfg-test-wired-static-no-prefix-8 \
-	ifcfg-test-wired-static-no-prefix-16 \
-	ifcfg-test-wired-static-no-prefix-24 \
-	ifcfg-test-wired-ipv6-only \
-	ifcfg-test-wifi-wep-passphrase \
-	keys-test-wifi-wep-passphrase \
-	ifcfg-test-wifi-wep-40-ascii \
-	keys-test-wifi-wep-40-ascii \
-	ifcfg-test-wifi-wep-104-ascii \
-	keys-test-wifi-wep-104-ascii \
-	ifcfg-test-wired-qeth-static \
-	ifcfg-test-wired-ctc-static \
-	ifcfg-test-bridge-main \
-	ifcfg-test-bridge-component \
-	ifcfg-test-bridge-missing-stp \
-	ifcfg-test-vlan-interface \
-	ifcfg-test-vlan-only-vlanid \
-	ifcfg-test-vlan-only-device \
-	ifcfg-test-vlan-physdev \
-	ifcfg-test-vlan-reorder-hdr-1 \
-	ifcfg-test-vlan-reorder-hdr-2 \
-	ifcfg-test-vlan-flags-1 \
-	ifcfg-test-vlan-flags-2 \
-	ifcfg-test-wifi-wep-no-keys \
-	ifcfg-test-permissions \
-	ifcfg-test-wifi-wep-agent-keys \
-	ifcfg-test-wifi-dynamic-wep-leap \
-	keys-test-wifi-dynamic-wep-leap \
-	ifcfg-test-infiniband \
-	ifcfg-test-bond-main \
-	ifcfg-test-bond-slave \
-	ifcfg-test-bond-slave-ib \
-	ifcfg-test-bond-mode-numeric \
-	ifcfg-test-dcb \
-	ifcfg-test-dcb-default-app-priorities \
-	ifcfg-test-dcb-bad-booleans \
-	ifcfg-test-dcb-short-booleans \
-	ifcfg-test-dcb-bad-uints \
-	ifcfg-test-dcb-short-uints \
-	ifcfg-test-dcb-bad-percent \
-	ifcfg-test-dcb-short-percent \
-	ifcfg-test-dcb-pgpct-not-100 \
-	ifcfg-test-fcoe-fabric \
-	ifcfg-test-fcoe-vn2vn \
-	ifcfg-test-team-master-1 \
-	ifcfg-test-team-master-2 \
-	ifcfg-test-team-master-invalid \
-	ifcfg-test-team-port-1 \
-	ifcfg-test-team-port-2 \
-	ifcfg-test-team-port-empty-config \
-	ifcfg-test-vlan-trailing-spaces \
-	ifcfg-test-dns-options \
-	ifcfg-test-wired-wake-on-lan \
-	ifcfg-test-wired-ipv6-only-1
-
-# make target dependencies can't have colons in their names, which ends up
-# meaning that we can't add the alias files to EXTRA_DIST
-ALIAS_FILES = \
-	ifcfg-aliasem0 \
-	ifcfg-aliasem0:1 \
-	ifcfg-aliasem0:2 \
-	ifcfg-aliasem0:99 \
-	ifcfg-aliasem1 \
-	ifcfg-aliasem1:1 \
-	ifcfg-aliasem2 \
-	ifcfg-aliasem2:1
-
-dist-hook:
-	@for f in $(ALIAS_FILES); do \
-		cp $(abs_srcdir)/$$f $(distdir)/; \
-	done
-
-check-local:
-	@for f in $(EXTRA_DIST) $(ALIAS_FILES); do \
-		chmod 0600 $(abs_srcdir)/$$f; \
-	done
-
-# Make the special temp dir for some written connections
-	mkdir -p $(abs_builddir)/tmp
-
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 2359852f08..df332b2407 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -8982,6 +8982,9 @@ int main (int argc, char **argv)
 {
 	nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT");
 
+	if (g_mkdir_with_parents (TEST_SCRATCH_DIR"/network-scripts/tmp", 0755) != 0)
+		g_error ("failure to create test directory \"%s\": %s", TEST_SCRATCH_DIR"/network-scripts/tmp", g_strerror (errno));
+
 	g_test_add_func (TPATH "svUnescape", test_svUnescape);
 	g_test_add_func (TPATH "vlan-trailing-spaces", test_read_vlan_trailing_spaces);