[PATCH 3/5] tests: add test_dmesg that has fixed boot time

Util-Linux package development
 help / color / mirror / Atom feed

From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: Sami Kerola <kerolasa@iki.fi>
Subject: [PATCH 3/5] tests: add test_dmesg that has fixed boot time
Date: Sun, 22 Mar 2015 23:05:28 +0000	[thread overview]
Message-ID: <1427065530-10695-4-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1427065530-10695-1-git-send-email-kerolasa@iki.fi>

This allows testing time stamp formats.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 sys-utils/Makemodule.am       |  4 ++++
 sys-utils/dmesg.c             |  5 +++++
 tests/commands.sh             |  2 +-
 tests/ts/dmesg/console-levels |  4 ++--
 tests/ts/dmesg/decode         |  4 ++--
 tests/ts/dmesg/delta          |  4 ++--
 tests/ts/dmesg/facilities     |  4 ++--
 tests/ts/dmesg/indentation    | 10 +++++-----
 8 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index c1d587a..3177e7c 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -75,6 +75,10 @@ dist_man_MANS += sys-utils/dmesg.1
 dmesg_SOURCES = sys-utils/dmesg.c lib/monotonic.c
 dmesg_LDADD = $(LDADD) libcommon.la libtcolors.la $(REALTIME_LIBS)
 dmesg_CFLAGS = $(AM_CFLAGS)
+check_PROGRAMS += test_dmesg
+test_dmesg_SOURCES = $(dmesg_SOURCES)
+test_dmesg_LDADD = $(dmesg_LDADD)
+test_dmesg_CFLAGS = -DTEST_DMESG $(dmesg_CFLAGS)
 endif
 
 if BUILD_CTRLALTDEL
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index b56199f..a17cc70 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1378,8 +1378,13 @@ int main(int argc, char *argv[])
 	    is_timefmt(&ctl, CTIME) ||
 	    is_timefmt(&ctl, ISO8601)) {
 
+#ifdef TEST_DMESG
+		ctl.boot_time.tv_sec = 1234567890;
+		ctl.boot_time.tv_usec = 123456;
+#else
 		if (get_boot_time(&ctl.boot_time) != 0)
 			ctl.time_fmt = DMESG_TIMEFTM_NONE;
+#endif
 	}
 
 	if (delta)
diff --git a/tests/commands.sh b/tests/commands.sh
index 420feb9..e3ac433 100644
--- a/tests/commands.sh
+++ b/tests/commands.sh
@@ -4,6 +4,7 @@ TS_TESTUSER=${TS_TESTUSER:-"nobody"}
 # helpers
 TS_HELPER_BYTESWAP="$top_builddir/test_byteswap"
 TS_HELPER_CPUSET="$top_builddir/test_cpuset"
+TS_HELPER_DMESG="$top_builddir/test_dmesg"
 TS_HELPER_ISLOCAL="$top_builddir/test_islocal"
 TS_HELPER_ISMOUNTED="$top_builddir/test_ismounted"
 TS_HELPER_LIBMOUNT_CONTEXT="$top_builddir/test_mount_context"
@@ -36,7 +37,6 @@ TS_CMD_CAL=${TS_CMD_CAL-"$top_builddir/cal"}
 TS_CMD_COLRM=${TS_CMD_COLRM:-"$top_builddir/colrm"}
 TS_CMD_COL=${TS_CMD_COL:-"$top_builddir/col"}
 TS_CMD_COLUMN=${TS_CMD_COLUMN:-"$top_builddir/column"}
-TS_CMD_DMESG=${TS_CMD_DMESG-"$top_builddir/dmesg"}
 TS_CMD_EJECT=${TS_CMD_EJECT-"$top_builddir/eject"}
 TS_CMD_FALLOCATE=${TS_CMD_FALLOCATE-"$top_builddir/fallocate"}
 TS_CMD_FDISK=${TS_CMD_FDISK-"$top_builddir/fdisk"}
diff --git a/tests/ts/dmesg/console-levels b/tests/ts/dmesg/console-levels
index 14c69c9..9abd5b2 100755
--- a/tests/ts/dmesg/console-levels
+++ b/tests/ts/dmesg/console-levels
@@ -18,10 +18,10 @@ TS_DESC="levels"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-ts_check_test_command "$TS_CMD_DMESG"
+ts_check_test_command "$TS_HELPER_DMESG"
 
 for I in {-1..8}; do
-	$TS_CMD_DMESG -F $TS_SELF/input -l $I >> $TS_OUTPUT 2>/dev/null
+	$TS_HELPER_DMESG -F $TS_SELF/input -l $I >> $TS_OUTPUT 2>/dev/null
 done
 
 ts_finalize
diff --git a/tests/ts/dmesg/decode b/tests/ts/dmesg/decode
index 63f3c5c..4725208 100755
--- a/tests/ts/dmesg/decode
+++ b/tests/ts/dmesg/decode
@@ -18,8 +18,8 @@ TS_DESC="decode"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-ts_check_test_command "$TS_CMD_DMESG"
+ts_check_test_command "$TS_HELPER_DMESG"
 
-$TS_CMD_DMESG -x -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG -x -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/delta b/tests/ts/dmesg/delta
index da48042..4b55bf6 100755
--- a/tests/ts/dmesg/delta
+++ b/tests/ts/dmesg/delta
@@ -18,8 +18,8 @@ TS_DESC="delta"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-ts_check_test_command "$TS_CMD_DMESG"
+ts_check_test_command "$TS_HELPER_DMESG"
 
-$TS_CMD_DMESG -d -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
+$TS_HELPER_DMESG -d -F $TS_SELF/input >> $TS_OUTPUT 2>/dev/null
 
 ts_finalize
diff --git a/tests/ts/dmesg/facilities b/tests/ts/dmesg/facilities
index 7066ae5..bc44c25 100755
--- a/tests/ts/dmesg/facilities
+++ b/tests/ts/dmesg/facilities
@@ -18,10 +18,10 @@ TS_DESC="facilities"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-ts_check_test_command "$TS_CMD_DMESG"
+ts_check_test_command "$TS_HELPER_DMESG"
 
 for I in {-1..12}; do
-	$TS_CMD_DMESG -F $TS_SELF/input -f $I >> $TS_OUTPUT 2>/dev/null
+	$TS_HELPER_DMESG -F $TS_SELF/input -f $I >> $TS_OUTPUT 2>/dev/null
 done
 
 ts_finalize
diff --git a/tests/ts/dmesg/indentation b/tests/ts/dmesg/indentation
index 7419888..624dd9b 100755
--- a/tests/ts/dmesg/indentation
+++ b/tests/ts/dmesg/indentation
@@ -18,14 +18,14 @@ TS_DESC="indentation"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-ts_check_test_command "$TS_CMD_DMESG"
+ts_check_test_command "$TS_HELPER_DMESG"
 
-$TS_CMD_DMESG -F $TS_SELF/newlines > $TS_OUTPUT 2>&1
+$TS_HELPER_DMESG -F $TS_SELF/newlines > $TS_OUTPUT 2>&1
 
-$TS_CMD_DMESG -F $TS_SELF/newlines -x >> $TS_OUTPUT 2>&1
+$TS_HELPER_DMESG -F $TS_SELF/newlines -x >> $TS_OUTPUT 2>&1
 
-$TS_CMD_DMESG --time-format=delta --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1
+$TS_HELPER_DMESG --time-format=delta --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1
 
-$TS_CMD_DMESG --time-format=notime --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1
+$TS_HELPER_DMESG --time-format=notime --file $TS_SELF/newlines >> $TS_OUTPUT 2>&1
 
 ts_finalize
-- 
2.3.3

next prev parent reply	other threads:[~2015-03-22 23:05 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-22 23:05 [PATCH 0/5] pull: one dmesg compiler warning fix and bunch of tests Sami Kerola
2015-03-22 23:05 ` [PATCH 1/5] dmesg: fix shadow declaration Sami Kerola
2015-03-22 23:05 ` [PATCH 2/5] tests: add dmesg multiline message check Sami Kerola
2015-03-22 23:05 ` Sami Kerola [this message]
2015-03-22 23:05 ` [PATCH 4/5] tests: check timestamp formats Sami Kerola
2015-03-22 23:05 ` [PATCH 5/5] tests: check dmesg message coloring Sami Kerola
2015-03-23 10:44 ` [PATCH 0/5] pull: one dmesg compiler warning fix and bunch of tests Karel Zak

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c1d587a dfblob:3177e7c dfblob:b56199f dfblob:a17cc70
dfblob:420feb9 dfblob:e3ac433 dfblob:14c69c9 dfblob:9abd5b2
dfblob:63f3c5c dfblob:4725208 dfblob:da48042 dfblob:4b55bf6
dfblob:7066ae5 dfblob:bc44c25 dfblob:7419888 dfblob:624dd9b )
 OR (
bs:"[PATCH 3/5] tests: add test_dmesg that has fixed boot time" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1427065530-10695-4-git-send-email-kerolasa@iki.fi \
    --to=kerolasa@iki.fi \
    --cc=util-linux@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox