From 48c6157eb9c10bdca89af2792177afc0380ef9c5 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 7 Nov 2005 08:50:53 +0000 Subject: Fix the test suite so that individual *.tests files can be run ala COMMAND=sort ./sort.tests So we can compare against non-busybox versions, and possibly our testsuite will be useful to somebody like the Linux Test Project someday. Redid testing.sh to add new command, "optional", to skip tests that require certain features. (use: `optional FEATURE_SORT_BIG`, or `optional ""` to stop skipping.) Note that optional is a NOP if the environment variable "OPTIONFLAGS" is blank, so although we're marking up the tests with busybox specific knowledge, it doesn't interfere with running the tests without busybox. Moved setting the "OPTIONFLAGS" environment variable to runtest. Philosophy: busybox-specific stuff belongs in runtest; both testing.sh and the tests themselves should be as busybox-agnostic as possible. Moved detecting that a command isn't in busybox at all (hence skipping the entire command.tests file) to runtests. Rationale: optional can't currently test for more than one feature at a time, so if we clear anything with optional "" we might perform tests we don't want to. Marked up busybox.tests to know which tests need CAT enabled. Fixed up other tests to be happy with new notation. I suspect egrep should be appended to grep. It's a sub-feature, really... --- testsuite/runtest | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'testsuite/runtest') diff --git a/testsuite/runtest b/testsuite/runtest index 9fd2d0f..c1b1ec2 100755 --- a/testsuite/runtest +++ b/testsuite/runtest @@ -91,6 +91,11 @@ else applets=$(ls $srcdir) fi +# Set up option flags so tests can be selective. + +configfile=${bindir:-../../}/.config +export OPTIONFLAGS=:$(echo $(sed -nr 's/^CONFIG_(.*)=.*/\1/p' $configfile) | sed 's/ /:/') + for applet in $applets; do if [ "$applet" = "links" ]; then continue; fi if [ "$applet" != "CVS" -a -d "$srcdir/$applet" ]; then @@ -100,9 +105,18 @@ for applet in $applets; do status=1 fi fi + + # Is this a new-style test? applet=$(echo "$applet" | sed -n 's/\.tests$//p') if [ ${#applet} -ne 0 ] then + appcfg=`grep -i "^# CONFIG_$applet" $configfile` + if [ -n "$appcfg" ] + then + echo "SKIPPED: $applet (is configured out)" + continue + fi + # Setup environment for test. if [ -d links ]; then rm -f links/"$applet" else -- cgit v1.1