tests: rename test_sysinfo, remove tailing white-spaces

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index c96a422c6ef7a72daad1b7ba84355b26c217ba34..4963f103caeddc06ed026453d20e3e59d72c931b 100644 (file)
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -7,7 +7,7 @@ AWK=@AWK@
 TS_TESTUSER=${TS_TESTUSER:-"test"}
 
 # helpers
-TS_HELPER_SYSINFO="$TS_TOPDIR/helpers/mnt_test_sysinfo"
+TS_HELPER_SYSINFO="$TS_TOPDIR/helpers/test_sysinfo"
 
 # external commands
 TS_ECMD_BLKID="@BLKID@"

diff --git a/tests/helpers/Makefile.am b/tests/helpers/Makefile.am
index 0f28a7f8ad970e496daa1e441876edafc1b157af..7cf7ff4e093f72d4eccba6fd65d56718e9b21e97 100644 (file)
--- a/tests/helpers/Makefile.am
+++ b/tests/helpers/Makefile.am
@@ -1,7 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-noinst_PROGRAMS = mnt_test_sysinfo test_blkdev
-mnt_test_sysinfo_SOURCES = mnt_test_sysinfo.c
+noinst_PROGRAMS = test_sysinfo test_blkdev
 
 test_blkdev_SOURCES =  $(top_srcdir)/lib/blkdev.c \
                        $(top_srcdir)/lib/linux_version.c

diff --git a/tests/helpers/mnt_test_sysinfo.c b/tests/helpers/test_sysinfo.c
similarity index 96%
rename from tests/helpers/mnt_test_sysinfo.c
rename to tests/helpers/test_sysinfo.c
index 0e09a35fdb36bfa12d371159c53dc37cc7cfeee8..00ee25230fcb32221657c89d86e4ead8c3f21112 100644 (file)
--- a/tests/helpers/mnt_test_sysinfo.c
+++ b/tests/helpers/test_sysinfo.c
@@ -79,11 +79,11 @@ hlp_ulong_max32(void)
        return 0;
 }
 
-mntHlpfnc hlps[] = 
+mntHlpfnc hlps[] =
 {
        { "WORDSIZE",   hlp_wordsize    },
        { "pagesize",   hlp_pagesize    },
-       { "INT_MAX",    hlp_int_max     },      
+       { "INT_MAX",    hlp_int_max     },
        { "UINT_MAX",   hlp_uint_max    },
        { "LONG_MAX",   hlp_long_max    },
        { "ULONG_MAX",  hlp_ulong_max   },
@@ -108,7 +108,7 @@ main(int argc, char **argv)
                if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0) {
                        printf("%s <option>\n", argv[0]);
                        fputs("options:\n", stdout);
-                       for (fn = hlps; fn->name; fn++) 
+                       for (fn = hlps; fn->name; fn++)
                                printf("\t%s\n", fn->name);
                        exit(EXIT_SUCCESS);
                }
@@ -120,7 +120,7 @@ main(int argc, char **argv)
                        }
                }
        }
-       
+
        exit(re ? EXIT_FAILURE : EXIT_SUCCESS);
 }