diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-01 02:16:14 +0400 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-12-03 22:11:14 +0400 |
| commit | 50d48a1d154ef9ece016512817dbbd33c598f162 (patch) | |
| tree | f92c0048d17208c40c85bd7e84d76cf863a1ccc9 /tools/testing/selftests | |
| parent | 330a76f15651a715a54bc2022586a7be151c9963 (diff) | |
| download | linux-50d48a1d154ef9ece016512817dbbd33c598f162.tar.xz | |
rcutorture: Eliminate duplicate .config-check code
The commit uses configcheck.sh from within configinit.sh, replacing the
imperfect inline expansion that was there before.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests')
| -rwxr-xr-x | tools/testing/selftests/rcutorture/bin/configinit.sh | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/configinit.sh b/tools/testing/selftests/rcutorture/bin/configinit.sh index 926fbd30bcbd..939c16cd03ab 100755 --- a/tools/testing/selftests/rcutorture/bin/configinit.sh +++ b/tools/testing/selftests/rcutorture/bin/configinit.sh @@ -51,31 +51,6 @@ cp $builddir/.config $builddir/.config.new yes '' | make $buildloc oldconfig > $builddir/Make.modconfig.out 2>&1 # verify new config matches specification. +configcheck.sh $builddir/.config $c -sed -e 's/"//g' < $c > $T/c -sed -e 's/"//g' < $builddir/.config > $T/.config -sed -e 's/\(.*\)=n/# \1 is not set/' -e 's/^#CHECK#//' < $c | -awk ' - { - print "if grep -q \"" $0 "\" < '"$T/.config"'"; - print "then"; - print "\t:"; - print "else"; - if ($1 == "#") { - print "\tif grep -q \"" $2 "\" < '"$T/.config"'"; - print "\tthen"; - print "\t\techo \":" $2 ": improperly set\""; - print "\telse"; - print "\t\t:"; - print "\tfi"; - } else { - print "\techo \":" $0 ": improperly set\""; - } - print "fi"; - }' | sh > $T/diagnostics -if test -s $T/diagnostics -then - cat $T/diagnostics - exit 1 -fi exit 0 |