diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-04-22 16:55:28 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-06-05 18:12:56 +0200 |
| commit | 8af001eae44caa65b714233f1870119a3129558e (patch) | |
| tree | f1b5ba5fe1779a31aac5edf1543b124d605e4759 /src/settings/plugins/ifnet/tests | |
| parent | 0e9cd4f6fc44c617377c3bc6298e74dd86aaec01 (diff) | |
nmtst: combine files nm-test-helpers.h and nm-test-utils.h
Move the content of nm-test-helpers.h to nm-test-utils.h
which completly replaces the older file.
Signed-off-by: Thomas Haller <thaller@redhat.com>
Diffstat (limited to 'src/settings/plugins/ifnet/tests')
| -rw-r--r-- | src/settings/plugins/ifnet/tests/test_all.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/settings/plugins/ifnet/tests/test_all.c b/src/settings/plugins/ifnet/tests/test_all.c index e2b1576ad9..dc93dcccd6 100644 --- a/src/settings/plugins/ifnet/tests/test_all.c +++ b/src/settings/plugins/ifnet/tests/test_all.c @@ -28,7 +28,6 @@ #include <unistd.h> #include <nm-utils.h> -#include "nm-test-helpers.h" #include "nm-linux-platform.h" #include "nm-logging.h" @@ -38,6 +37,8 @@ #include "connection_parser.h" #include "nm-config.h" +#include "nm-test-utils.h" + /* Fake NMConfig handling; the values it returns don't matter, so this * is easier than forcing it to read our own config file, etc. */ |