new file mode 100755
@@ -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 ]
new file mode 100755
@@ -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 ]
new file mode 100755
@@ -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 ]
new file mode 100755
@@ -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