From 7df454fc9b96944d9cc57f565a1ba1f1373b2f02 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 28 Nov 2007 12:11:51 +0100 Subject: [PATCH] tests: rename test_sysinfo, remove tailing white-spaces Signed-off-by: Karel Zak --- tests/commands.sh.in | 2 +- tests/helpers/Makefile.am | 3 +-- tests/helpers/{mnt_test_sysinfo.c => test_sysinfo.c} | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) rename tests/helpers/{mnt_test_sysinfo.c => test_sysinfo.c} (96%) diff --git a/tests/commands.sh.in b/tests/commands.sh.in index c96a422c..4963f103 100644 --- 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 0f28a7f8..7cf7ff4e 100644 --- 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 0e09a35f..00ee2523 100644 --- 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