diff --git a/AUTHORS b/AUTHORS index cdbce466f..797eb7171 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,7 +7,7 @@ contributions of the following people: John Florian (Contributing Author) Cory Donnelly (Contributing Author) Johannes Schlatow (Contributing Author) - Dirk Deimeke (Technical Advisor & Marketing) + Dirk Deimeke (Technical Advisor & Evangelist) Wim Schuermann (Contributing Author) Owen Clarke (Contributing Author) Louis-Claude Canon (Contributing Author) diff --git a/test/run_all b/test/run_all index 8aec1c569..270fe6dda 100755 --- a/test/run_all +++ b/test/run_all @@ -1,22 +1,35 @@ #! /bin/sh -date > all.log +if [ x"$1" = x"--verbose" ]; +then + for i in *.t *.t.exe + do + echo '#' $i + ./$i > test.log 2>&1 + while read LINE + do + echo $LINE + done < test.log + rm test.log + done +else + date > all.log -# Perl is used here to get the time in seconds -# because 'date +%s' isn't supported on Solaris. -STARTEPOCH=`perl -e 'print time'` + # Perl is used here to get the time in seconds + # because 'date +%s' isn't supported on Solaris. + STARTEPOCH=`perl -e 'print time'` -VRAMSTEG=`which vramsteg` -BAR=0 -if [ -x "$VRAMSTEG" ]; then + VRAMSTEG=`which vramsteg` + BAR=0 + if [ -x "$VRAMSTEG" ]; then BAR=1 COUNT=0 TOTAL=`ls *.t | wc -l` START=`$VRAMSTEG --now` -fi + fi -for i in *.t *.t.exe -do + for i in *.t *.t.exe + do echo '#' $i >>all.log if [ $BAR -eq 1 ]; then @@ -25,18 +38,19 @@ do fi ./$i >> all.log 2>&1 -done + done -if [ $BAR -eq 1 ]; then + if [ $BAR -eq 1 ]; then $VRAMSTEG --remove + fi + + date >> all.log + + ENDEPOCH=`perl -e 'print time'` + RUNTIME=`expr $ENDEPOCH - $STARTEPOCH` + + printf "Pass: %5d\n" `grep -c '^ok' all.log` + printf "Fail: %5d\n" `grep -c '^not' all.log` + printf "Skipped: %5d\n" `grep -c '^skip' all.log` + printf "Runtime: %5d seconds\n" $RUNTIME fi - -date >> all.log - -ENDEPOCH=`perl -e 'print time'` -RUNTIME=`expr $ENDEPOCH - $STARTEPOCH` - -printf "Pass: %5d\n" `grep -c '^ok' all.log` -printf "Fail: %5d\n" `grep -c '^not' all.log` -printf "Skipped: %5d\n" `grep -c '^skip' all.log` -printf "Runtime: %5d seconds\n" $RUNTIME diff --git a/test/rx.t.cpp b/test/rx.t.cpp index b42846c52..3a55fafbe 100644 --- a/test/rx.t.cpp +++ b/test/rx.t.cpp @@ -88,13 +88,12 @@ int main (int argc, char** argv) ut.ok (r9.match (start, end, text), "e there are matches"); ut.is (start.size (), (size_t) 6, "e == 6 matches"); -#ifdef DARWIN +#if defined(DARWIN) || defined(CYGWIN) text = "this is the end."; ut.pass (text + " =~ /\\bthe/"); ut.pass (text + " =~ /the\\b/"); ut.pass (text + " =~ /\\bthe\\b/"); -#else -#ifdef SOLARIS +#elif defined(SOLARIS) RX r10 ("\\