aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-07-25 17:30:23 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-07-25 22:23:27 +0100
commitc8524364ff29e3f0bef0b21d66e571ba76e8d9d4 (patch)
tree51f673e1f0d88c035774e7748fc24688fc7ffbbd
parent16ddfa5eea9f27885c0de8540cb0035989fce2bd (diff)
downloadsyslinux-c8524364ff29e3f0bef0b21d66e571ba76e8d9d4.tar.gz
syslinux-c8524364ff29e3f0bef0b21d66e571ba76e8d9d4.tar.xz
syslinux-c8524364ff29e3f0bef0b21d66e571ba76e8d9d4.zip
tests: verify kernel cmdline parameter
Add a new test that verifies the kernel cmdline arguments we setup in our config file are passed to the kernel correctly. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--tests/linux/Makefile8
-rw-r--r--tests/linux/cmdline.cfg5
-rw-r--r--tests/linux/cmdline.results3
3 files changed, 14 insertions, 2 deletions
diff --git a/tests/linux/Makefile b/tests/linux/Makefile
index bfa3ca75..5d5230e0 100644
--- a/tests/linux/Makefile
+++ b/tests/linux/Makefile
@@ -31,7 +31,11 @@ kernelhello_cfg = kernelhello.cfg
kernelhello_files = $(kernelhello_cfg) kernelhello-vmlinuz
kernelhello_results = kernelhello.results
-STANDARD_TESTS = kernelhello pxetest
+cmdline_cfg = cmdline.cfg
+cmdline_files = $(cmdline_cfg) kernelhello-vmlinuz
+cmdline_results = cmdline.results
+
+STANDARD_TESTS = kernelhello pxetest cmdline
$(STANDARD_TESTS):
$(run-test)
@@ -39,7 +43,7 @@ empty:
touch empty-vmlinuz
$(run-test)
-tests: banner empty kernelhello $(derivative-tests)
+tests: banner empty kernelhello cmdline $(derivative-tests)
banner:
printf " Running Linux kernel regression tests...\n"
diff --git a/tests/linux/cmdline.cfg b/tests/linux/cmdline.cfg
new file mode 100644
index 00000000..2e684eee
--- /dev/null
+++ b/tests/linux/cmdline.cfg
@@ -0,0 +1,5 @@
+DEFAULT cmdline
+
+LABEL cmdline
+ KERNEL kernelhello-vmlinuz
+ APPEND console=ttyS0 this-is-my-cmdline arguments
diff --git a/tests/linux/cmdline.results b/tests/linux/cmdline.results
new file mode 100644
index 00000000..29159043
--- /dev/null
+++ b/tests/linux/cmdline.results
@@ -0,0 +1,3 @@
+
+[ 0.000000] Kernel command line: BOOT_IMAGE=kernelhello-vmlinuz console=ttyS0 this-is-my-cmdline arguments
+Hello, World!