forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor all.do and test.do in various directories.

Browse source 
Now 'redo test' runs the tests, but 'redo t' just builds the programs.

Also removed wvtest stuff; we're not really using it properly anyway and
it's not helping our testing right now.  It might come back later.
This commit is contained in:
Avery Pennarun 2010-11-21 05:47:48 -08:00
commit 39ef065443
14 changed files with 20 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

5
runtests.do
View file

@ -1,5 +0,0 @@
. ./wvtest.sh
redo t/all
WVSTART "t/runtests"
WVPASS redo t/runtests

3
t/all.do
View file

@ -1,2 +1 @@
redo-ifchange hello yellow bellow c d
redo example/all curse/all deps/all
redo-ifchange hello yellow bellow c d example/

0
t/curse/all.do → t/curse/test.do
View file

1
t/deps/.gitignore vendored
View file

@ -1 +1,2 @@
t1a
t2.count

1
t/deps/all.do
View file

@ -1 +0,0 @@
redo test1

2
t/deps/clean.do
View file

@ -1 +1 @@
rm -f *~ .*~ t1a
rm -f *~ .*~ *.count t1a

1
t/deps/t2.do Normal file
View file

@ -0,0 +1 @@
echo $$ >>t2.count

2
t/deps/test.do Normal file
View file

@ -0,0 +1,2 @@
redo test1 test2

8
t/deps/test2.do Normal file
View file

@ -0,0 +1,8 @@
rm -f t2.count
redo t2
redo t2
OUT=$(cat t2.count | wc -l)
if [ "$OUT" != 2 ]; then
echo "t2: expected 2"
exit 43
fi

3
t/runtests.do
View file

@ -1,3 +0,0 @@
redo-ifchange all
./hello >&2
redo deltest deltest2 test.args test2.args

4
t/test.do Normal file
View file

@ -0,0 +1,4 @@
redo-ifchange all
./hello >&2
redo deltest deltest2 test.args test2.args curse/test deps/test

5
test.do
View file

@ -1,3 +1,2 @@
redo-ifchange t/c.c t/all
echo >&2
./wvtestrun "$REDO" runtests >&2
redo-ifchange t/c.c t/test

134
wvtest.sh
View file

@ -1,134 +0,0 @@
#
# Include this file in your shell script by using:
# #!/bin/sh
# . ./wvtest.sh
#
# we don't quote $TEXT in case it contains newlines; newlines
# aren't allowed in test output. However, we set -f so that
# at least shell glob characters aren't processed.
_wvtextclean()
{
( set -f; echo $* )
}
if [ -n "$BASH_VERSION" ]; then
_wvfind_caller()
{
LVL=$1
WVCALLER_FILE=${BASH_SOURCE[2]}
WVCALLER_LINE=${BASH_LINENO[1]}
}
else
_wvfind_caller()
{
LVL=$1
WVCALLER_FILE="unknown"
WVCALLER_LINE=0
}
fi
_wvcheck()
{
CODE="$1"
TEXT=$(_wvtextclean "$2")
OK=ok
if [ "$CODE" -ne 0 ]; then
OK=FAILED
fi
echo "! $WVCALLER_FILE:$WVCALLER_LINE $TEXT $OK" >&2
if [ "$CODE" -ne 0 ]; then
exit $CODE
else
return 0
fi
}
WVPASS()
{
TEXT="$*"
_wvfind_caller
if "$@"; then
_wvcheck 0 "$TEXT"
return 0
else
_wvcheck 1 "$TEXT"
# NOTREACHED
return 1
fi
}
WVFAIL()
{
TEXT="$*"
_wvfind_caller
if "$@"; then
_wvcheck 1 "NOT($TEXT)"
# NOTREACHED
return 1
else
_wvcheck 0 "NOT($TEXT)"
return 0
fi
}
_wvgetrv()
{
( "$@" >&2 )
echo -n $?
}
WVPASSEQ()
{
_wvfind_caller
_wvcheck $(_wvgetrv [ "$#" -eq 2 ]) "exactly 2 arguments"
echo "Comparing:" >&2
echo "$1" >&2
echo "--" >&2
echo "$2" >&2
_wvcheck $(_wvgetrv [ "$1" = "$2" ]) "'$1' = '$2'"
}
WVPASSNE()
{
_wvfind_caller
_wvcheck $(_wvgetrv [ "$#" -eq 2 ]) "exactly 2 arguments"
echo "Comparing:" >&2
echo "$1" >&2
echo "--" >&2
echo "$2" >&2
_wvcheck $(_wvgetrv [ "$1" != "$2" ]) "'$1' != '$2'"
}
WVPASSRC()
{
RC=$?
_wvfind_caller
_wvcheck $(_wvgetrv [ $RC -eq 0 ]) "return code($RC) == 0"
}
WVFAILRC()
{
RC=$?
_wvfind_caller
_wvcheck $(_wvgetrv [ $RC -ne 0 ]) "return code($RC) != 0"
}
WVSTART()
{
echo >&2
_wvfind_caller
echo "Testing \"$*\" in $WVCALLER_FILE:" >&2
}

186
wvtestrun
View file

@ -1,186 +0,0 @@
#!/usr/bin/perl -w
#
# WvTest:
# Copyright (C)2007-2009 Versabanq Innovations Inc. and contributors.
# Licensed under the GNU Library General Public License, version 2.
# See the included file named LICENSE for license information.
#
use strict;
use Time::HiRes qw(time);
# always flush
$| = 1;
if (@ARGV < 1) {
print STDERR "Usage: $0 <command line...>\n";
exit 127;
}
print STDERR "Testing \"all\" in @ARGV:\n";
my $pid = open(my $fh, "-|");
if (!$pid) {
# child
setpgrp();
open STDERR, '>&STDOUT' or die("Can't dup stdout: $!\n");
exec(@ARGV);
exit 126; # just in case
}
my $istty = -t STDOUT;
my @log = ();
my ($gpasses, $gfails) = (0,0);
sub bigkill($)
{
my $pid = shift;
if (@log) {
print "\n" . join("\n", @log) . "\n";
}
print STDERR "\n! Killed by signal FAILED\n";
($pid > 0) || die("pid is '$pid'?!\n");
local $SIG{CHLD} = sub { }; # this will wake us from sleep() faster
kill 15, $pid;
sleep(2);
if ($pid > 1) {
kill 9, -$pid;
}
kill 9, $pid;
exit(125);
}
# parent
local $SIG{INT} = sub { bigkill($pid); };
local $SIG{TERM} = sub { bigkill($pid); };
local $SIG{ALRM} = sub {
print STDERR "Alarm timed out! No test results for too long.\n";
bigkill($pid);
};
sub colourize($)
{
my $result = shift;
my $pass = ($result eq "ok");
if ($istty) {
my $colour = $pass ? "\e[32;1m" : "\e[31;1m";
return "$colour$result\e[0m";
} else {
return $result;
}
}
sub mstime($$$)
{
my ($floatsec, $warntime, $badtime) = @_;
my $ms = int($floatsec * 1000);
my $str = sprintf("%d.%03ds", $ms/1000, $ms % 1000);
if ($istty && $ms > $badtime) {
return "\e[31;1m$str\e[0m";
} elsif ($istty && $ms > $warntime) {
return "\e[33;1m$str\e[0m";
} else {
return "$str";
}
}
sub resultline($$)
{
my ($name, $result) = @_;
return sprintf("! %-65s %s", $name, colourize($result));
}
my $allstart = time();
my ($start, $stop);
sub endsect()
{
$stop = time();
if ($start) {
printf " %s %s\n", mstime($stop - $start, 500, 1000), colourize("ok");
}
}
while (<$fh>)
{
chomp;
s/\r//g;
if (/^\s*Testing "(.*)" in (.*):\s*$/)
{
alarm(120);
my ($sect, $file) = ($1, $2);
endsect();
printf("! %s %s: ", $file, $sect);
@log = ();
$start = $stop;
}
elsif (/^!\s*(.*?)\s+(\S+)\s*$/)
{
alarm(120);
my ($name, $result) = ($1, $2);
my $pass = ($result eq "ok");
if (!$start) {
printf("\n! Startup: ");
$start = time();
}
push @log, resultline($name, $result);
if (!$pass) {
$gfails++;
if (@log) {
print "\n" . join("\n", @log) . "\n";
@log = ();
}
} else {
$gpasses++;
print ".";
}
}
else
{
push @log, $_;
}
}
endsect();
my $newpid = waitpid($pid, 0);
if ($newpid != $pid) {
die("waitpid returned '$newpid', expected '$pid'\n");
}
my $code = $?;
my $ret = ($code >> 8);
# return death-from-signal exits as >128. This is what bash does if you ran
# the program directly.
if ($code && !$ret) { $ret = $code | 128; }
if ($ret && @log) {
print "\n" . join("\n", @log) . "\n";
}
if ($code != 0) {
print resultline("Program returned non-zero exit code ($ret)", "FAILED");
}
my $gtotal = $gpasses+$gfails;
printf("\nWvTest: %d test%s, %d failure%s, total time %s.\n",
$gtotal, $gtotal==1 ? "" : "s",
$gfails, $gfails==1 ? "" : "s",
mstime(time() - $allstart, 2000, 5000));
print STDERR "\nWvTest result code: $ret\n";
exit( $ret ? $ret : ($gfails ? 125 : 0) );