| Message ID | 1445992931-28107-11-git-send-email-olof@lixom.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Oct 28, 2015 at 09:42:11AM +0900, Olof Johansson wrote: > Again, these tests could be more complicated but at least it gets > the very basics covered. > > Signed-off-by: Olof Johansson <olof@lixom.net> Good thing you added =n as valid, this would be much harder otherwise :-) Signed-off-by: Darren Hart <dvhart@linux.intel.com>
diff --git a/scripts/kconfig/merge_config_test/12-cmdline-success.sh b/scripts/kconfig/merge_config_test/12-cmdline-success.sh new file mode 100755 index 0000000..f8f2bf1 --- /dev/null +++ b/scripts/kconfig/merge_config_test/12-cmdline-success.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +. "$(dirname $0)/common.sh" + +# Turn off an option + +merge CONFIG_64BIT=n +M=$? + +check CONFIG_64BIT=y +G=$? + +[ $M -eq 0 -a $G -ne 0 ] diff --git a/scripts/kconfig/merge_config_test/13-cmdline-failure.sh b/scripts/kconfig/merge_config_test/13-cmdline-failure.sh new file mode 100755 index 0000000..6504786 --- /dev/null +++ b/scripts/kconfig/merge_config_test/13-cmdline-failure.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +. "$(dirname $0)/common.sh" + +# Try to turn off an option that won't turn off. + +merge CONFIG_MMU=n +M=$? + +check CONFIG_MMU=y +G=$? + +[ $M -ne 0 -a $G -eq 0 ] diff --git a/scripts/kconfig/merge_config_test/14-cmdline-reduntant.sh b/scripts/kconfig/merge_config_test/14-cmdline-reduntant.sh new file mode 100755 index 0000000..c9c3fab --- /dev/null +++ b/scripts/kconfig/merge_config_test/14-cmdline-reduntant.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +. "$(dirname $0)/common.sh" + +# Make sure redundant options are warned about + +merge_r CONFIG_64BIT=n CONFIG_64BIT=n +M=$? + +check CONFIG_64BIT=y +G=$? + +[ $M -ne 0 -a $G -ne 0 ] diff --git a/scripts/kconfig/merge_config_test/15-cmdline-complex.sh b/scripts/kconfig/merge_config_test/15-cmdline-complex.sh new file mode 100755 index 0000000..b754610 --- /dev/null +++ b/scripts/kconfig/merge_config_test/15-cmdline-complex.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +. "$(dirname $0)/common.sh" + +# Make sure redundant options are warned about + +FRAG1=$(writefrag) << EOF +CONFIG_EMBEDDED=y +EOF + +FRAG2=$(writefrag) << EOF +CONFIG_MMU=n +EOF + +merge_r ${FRAG1} CONFIG_64BIT=n ${FRAG2} +M=$? + +check CONFIG_64BIT=y +G1=$? + +check CONFIG_EMBEDDED=y +G2=$? + +check CONFIG_MMU=y +G3=$? + +[ $G1 -ne 0 -a $G2 -eq 0 -a $G3 -eq 0 ] +G=$? + +[ $M -ne 0 -a $G -eq 0 ]
Again, these tests could be more complicated but at least it gets the very basics covered. Signed-off-by: Olof Johansson <olof@lixom.net> --- .../merge_config_test/12-cmdline-success.sh | 13 ++++++++++ .../merge_config_test/13-cmdline-failure.sh | 13 ++++++++++ .../merge_config_test/14-cmdline-reduntant.sh | 13 ++++++++++ .../merge_config_test/15-cmdline-complex.sh | 30 ++++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100755 scripts/kconfig/merge_config_test/12-cmdline-success.sh create mode 100755 scripts/kconfig/merge_config_test/13-cmdline-failure.sh create mode 100755 scripts/kconfig/merge_config_test/14-cmdline-reduntant.sh create mode 100755 scripts/kconfig/merge_config_test/15-cmdline-complex.sh