From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/testsuite/runtest | 185 +++++++++++++++++---------- 1 file changed, 118 insertions(+), 67 deletions(-) (limited to 'release/src/router/busybox/testsuite/runtest') diff --git a/release/src/router/busybox/testsuite/runtest b/release/src/router/busybox/testsuite/runtest index 2cf85f5d..cade871a 100755 --- a/release/src/router/busybox/testsuite/runtest +++ b/release/src/router/busybox/testsuite/runtest @@ -1,113 +1,164 @@ #!/bin/sh -PATH=$(dirname $(pwd)):$PATH - -show_result () -{ - local resolution=$1 - local testcase=$2 - local status=0 - - if [ $resolution = XPASS -o $resolution = FAIL ]; then - status=1 - fi - - if [ "$verbose" -o $status -eq 1 ]; then - echo "$resolution: $testcase" - fi - - return $status +# Usage: +# runtest [applet1] [applet2...] + +# Helper for helpers. Oh my... +test x"$ECHO" != x"" || { + ECHO="echo" + test x"`echo -ne`" = x"" || { + # Compile and use a replacement 'echo' which understands -e -n + ECHO="$PWD/echo-ne" + test -x "$ECHO" || { + gcc -Os -o "$ECHO" ../scripts/echo.c || exit 1 + } + } + export ECHO } -run_applet_testcase () +# Run one old-style test. +# Tests are stored in applet/testcase shell scripts. +# They are run using "sh -x -e applet/testcase". +# Option -e will make testcase stop on the first failed command. +run_applet_testcase() { - local applet=$1 - local testcase=$2 + local applet="$1" + local testcase="$2" local status=0 - local X= + local uc_applet=$(echo "$applet" | tr a-z A-Z) + local testname="$testcase" - local uc_applet=$(echo $applet | tr a-z A-Z) - local testname=$(basename $testcase) - - if grep -q "^# CONFIG_${uc_applet} is not set$" ../.config; then - show_result UNTESTED $testname + testname="${testname##*/}" # take basename + if grep "^# CONFIG_$uc_applet is not set$" "$bindir/.config" >/dev/null; then + echo "UNTESTED: $testname" return 0 fi - if grep -q "^# FEATURE: " $testcase; then - local feature=`sed -ne 's/^# FEATURE: //p' $testcase` + if grep "^# FEATURE: " "$testcase" >/dev/null; then + local feature=$(sed -ne 's/^# FEATURE: //p' "$testcase") - if grep -q "^# ${feature} is not set$" ../.config; then - show_result UNTESTED $testname + if grep "^# $feature is not set$" "$bindir/.config" >/dev/null; then + echo "UNTESTED: $testname" return 0 fi fi - if grep -q "^# XFAIL$" $testcase; then - X=X - fi - - mkdir tmp - pushd tmp >/dev/null - - if . ../$testcase >/dev/null 2>&1; then - show_result ${X}PASS $testname - status=$? + rm -rf ".tmpdir.$applet" + mkdir -p ".tmpdir.$applet" + cd ".tmpdir.$applet" || return 1 + +# echo "Running testcase $testcase" + d="$tsdir" \ + sh -x -e "$testcase" >"$testname.stdout.txt" 2>&1 || status=$? + if [ $status -ne 0 ]; then + echo "FAIL: $testname" + if [ x"$VERBOSE" != x ]; then + cat "$testname.stdout.txt" + fi else - show_result ${X}FAIL $testname - status=$? + echo "PASS: $testname" fi - popd >/dev/null - rm -rf tmp + cd .. + rm -rf ".tmpdir.$applet" return $status } -run_applet_tests () +# Run all old-style tests for given applet +run_oldstyle_applet_tests() { - local applet=$1 - + local applet="$1" local status=0 - for testcase in $applet/*; do - if [ "$testcase" = "$applet/CVS" ]; then - continue - fi - - if run_applet_testcase $applet $testcase; then - : - else - status=1 - fi + for testcase in "$tsdir/$applet"/*; do + # switch on basename of $testcase + case "${testcase##*/}" in + .*) continue ;; # .svn, .git etc + *~) continue ;; # backup files + "CVS") continue ;; + \#*) continue ;; # CVS merge residues + *.mine) continue ;; # svn-produced junk + *.r[0-9]*) continue ;; # svn-produced junk + esac + run_applet_testcase "$applet" "$testcase" || status=1 done - return $status } -status=0 + +lcwd=$(pwd) +[ x"$tsdir" != x ] || tsdir="$lcwd" +[ x"$bindir" != x ] || bindir="${lcwd%/*}" # one directory up from $lcwd +PATH="$bindir:$PATH" + +if [ x"$VERBOSE" = x ]; then + export VERBOSE= +fi if [ x"$1" = x"-v" ]; then - verbose=1 + export VERBOSE=1 shift fi +implemented=$( + "$bindir/busybox" 2>&1 | + while read line; do + if [ x"$line" = x"Currently defined functions:" ]; then + xargs | sed 's/,//g' + break + fi + done + ) + +applets="$implemented" if [ $# -ne 0 ]; then applets="$@" -else - applets="*" fi +# Populate a directory with links to all busybox applets + +LINKSDIR="$bindir/runtest-tempdir-links" +rm -rf "$LINKSDIR" 2>/dev/null +mkdir "$LINKSDIR" +for i in $implemented; do + ln -s "$bindir/busybox" "$LINKSDIR/$i" +done + +# Set up option flags so tests can be selective. +export OPTIONFLAGS=:$( + sed -nr 's/^CONFIG_//p' "$bindir/.config" | + sed 's/=.*//' | xargs | sed 's/ /:/g' + ) + +status=0 for applet in $applets; do - if [ "$applet" != CVS -a -d "$applet" ]; then - if run_applet_tests $applet; then - : - else - status=1 + # Any old-style tests for this applet? + if [ -d "$tsdir/$applet" ]; then + run_oldstyle_applet_tests "$applet" || status=1 + fi + + # Is this a new-style test? + if [ -f "$applet.tests" ]; then + if [ ! -h "$LINKSDIR/$applet" ]; then + # (avoiding bash'ism "${applet:0:4}") + if ! echo "$applet" | grep "^all_" >/dev/null; then + echo "SKIPPED: $applet (not built)" + continue + fi fi +# echo "Running test $tsdir/$applet.tests" + PATH="$LINKSDIR:$tsdir:$bindir:$PATH" \ + "$tsdir/$applet.tests" || status=1 fi done +# Leaving the dir makes it somewhat easier to run failed test by hand +#rm -rf "$LINKSDIR" + +if [ $status -ne 0 ] && [ x"$VERBOSE" = x ]; then + echo "Failures detected, running with -v (verbose) will give more info" +fi exit $status -- cgit v1.2.3-54-g00ecf