commit - 909825343bd0a4b5ad4580a687a43abf6989761a
commit + 315f51e9ef7ed3abbf51273a489c56e451868672
blob - 7eb267c9622bba9d8ab2a38b7c7d1caca676d9bc
blob + 6412d3ac001eec975c236cf75e58896b406b7507
--- exercise
+++ exercise
# config options
set opts(-B) . ;# basedir
set opts(-pd) {*} ;# pattern for test search directories
-set opts(-ps) {*.tests} ;# pattern for test suite executable files
+set opts(-ps) {*.ts} ;# pattern for test suite executable files
set opts(-pt) {*.t} ;# pattern for test executable files
set opts(-q) 0 ;# quiet mode
blob - 88ca135f4cca04a357ad0bdb8a8aea42708a4769
blob + dede5ec1ec5c391b005de73502afead553f8ed7f
--- exercise.1
+++ exercise.1
To be recognized as tests, files must match the pattern
.Pa *.t .
To be run as test suites (see below), files must match the pattern
-.Pa *.tests .
+.Pa *.ts .
.Pp
The options are as follows:
.Bl -tag -width Ds
.It Fl p Sy s= Ns Ar pattern
Process (only) files matching the given pattern as test suites.
Defaults to
-.Sq *.tests .
+.Sq *.ts .
.It Fl p Sy t= Ns Ar pattern
Process (only) files matching the given pattern as tests.
Defaults to
blob - a233dc1ec26e6a1e06280008ce4935e1ccf48ffa
blob + 23086b0af7acfbf15c671d065c5a935d5aae1111
--- support/adapt-tst
+++ support/adapt-tst
# Usage: adapt-tst cmd [arg ...]
#
# Example: Given a test suite in 'foo.tst.c' that is built into an executable
-# 'foo.tst', create the script 'foo.tests' containing the following:
+# 'foo.tst', create the script 'foo.ts' containing the following:
#
# #!/bin/sh
# exec ./adapt-tst ./foo.tst
blob - 9790d53e7c84df2b62e136164c011d69b87f5ad8
blob + 73b6078d079f40e55f91db97ef39cf259942da86
--- tests/exercise/testsuite/inconsistent.t
+++ tests/exercise/testsuite/inconsistent.t
# this tests the case where run is less than the sum of ok, fail, and error.
-export tst=$0.tests
+export tst=$0.ts
exec ./assert-exercise $0 \
'run 1 ok 0 fail 0 error 1\n' \
"test test test\\n$tst: counters inconsistent\\nerror $tst\\n\\n" <<EOF
blob - b2e707ce8b71c9bcf7a3c2d24541c05c52f0b316
blob + 6551cc4487af10f991e6a18ce67d1cb466fb2d10
--- tests/exercise/testsuite/progress.t
+++ tests/exercise/testsuite/progress.t
# a test suite may report partial progress counters
# before the final summary
-export tst=$0.tests
+export tst=$0.ts
exec ./assert-exercise $0 \
'run 6 ok 1 fail 2 error 3\n' \
"fail $tst\n\n" <<EOF
blob - 8fe743e0170a78caacbb9fa0f752bf2407802171
blob + ea0ab6bf356ac67480f0e684e4831f7983b2e369
--- tests/exercise/testsuite/shortcount.t
+++ tests/exercise/testsuite/shortcount.t
# if a test suite exits early, the 'run' counter may remain greater than
# the sum of the others.
-export tst=$0.tests
+export tst=$0.ts
exec ./assert-exercise $0 \
"run 22 ok 10 fail 1 error 0\n" \
"test test test\n" <<EOF
blob - 35eceeee585255b971330d86a960d228e7ba6441
blob + 1f352e7a8f1eb1ef0876c0c9d2a3d3ee298279f7
--- tests/exercise/testsuite/stderr-fd.t
+++ tests/exercise/testsuite/stderr-fd.t
STAT='stat -f %d.%i' # BSDs
test "`uname`" = "Linux" && STAT='stat -c %d.%i -' # GNU
-export tst=$0.tests
+export tst=$0.ts
>$0.err # create the file assert-exercise will use
err=`$STAT <$0.err` # stat it
exec ./assert-exercise $0 \
blob - 86be25554f517b19b5ee549014db27cecaf7d474
blob + 8fcd268d75d352717cde62a8a0d36eb65e8cbe05
--- tests/exercise/testsuite.t
+++ tests/exercise/testsuite.t
#!/bin/sh
-# if a test's filename matches *.tests its stdout should be parsed as
+# if a test's filename matches *.ts its stdout should be parsed as
# a summary and get integrated as a set of subtests
# an exit code other than 127 should not matter
# stderr should be passed through verbatim
-export tst=$0.tests
+export tst=$0.ts
exec ./assert-exercise $0 \
'run 6 ok 1 fail 2 error 3\n' \
"test test test\nfail $tst\n\n" <<EOF
blob - 63fd0140496c03831f050b2d3a76e85208829247
blob + d3b706d3660e25df4360ca058d55d973797cad77
--- tests/support/adapt-tst.t
+++ tests/support/adapt-tst.t
EOF
chmod +x $tmp
-export tst=$0.tests
+export tst=$0.ts
./assert-exercise $0 \
"run 3 ok 2 fail 1 error 0\n" \
"something something unexpected\ntest_3()\tFAIL\nfail $tst\n\n" \