t/*: rearrange tests into numbered directories.

It was getting way too ad-hoc in there. Let's reorganize the tests so that there's a good, obvious, suggested sequence to run them in.
2012-02-08 00:33:00 -05:00 · 2012-02-08 00:33:00 -05:00 · 7822f5a5bb
commit 7822f5a5bb
parent 116c279e96
170 changed files with 100 additions and 80 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,10 +1,5 @@
 /.redo
 *~
 *.pyc
 *.tmp
 /.redo
 t/CC
 t/LD
 t/[yb]ellow
 t/hello
 t/*.o
 /redo-sh
--- a/t/.gitignore
+++ b/t/.gitignore
@ -1,22 +1,2 @@
 test.args
 test2.args
 /passfail
 /mode1
 /makedir
 /makedir.log
 /chdir1
 /silence
 /silence.do
 /touch1
 /touch1.do
 /deltest2
 /always1
 /always1.log
 /ifcreate[12].log
 /ifcreate[12].dep
 /ifcreate[12]
 /broken
 /shellfile
 /nonshelltest
 /*.vartest
 /atime2
--- a/t/100-args/.gitignore
+++ b/t/100-args/.gitignore
@ -0,0 +1 @@
 passfail
--- a/t/100-args/all.do
+++ b/t/100-args/all.do
@ -0,0 +1 @@
 redo test.args test2.args passfailtest
--- a/t/100-args/clean.do
+++ b/t/100-args/clean.do
@ -0,0 +1 @@
 rm -f passfail *~ .*~
--- a/t/100-args/default.args.do
+++ b/t/100-args/default.args.do
--- a/t/100-args/passfail.do
+++ b/t/100-args/passfail.do
--- a/t/100-args/passfailtest.do
+++ b/t/100-args/passfailtest.do
@ -1,4 +1,4 @@
-. ./skip-if-minimal-do.sh
+. ../skip-if-minimal-do.sh
 rm -f pleasefail
 redo passfail
--- a/t/100-args/test2.args.do
+++ b/t/100-args/test2.args.do
--- a/t/101-atime/.gitignore
+++ b/t/101-atime/.gitignore
@ -0,0 +1 @@
 atime2
--- a/t/101-atime/all.do
+++ b/t/101-atime/all.do
@ -0,0 +1 @@
 redo atime
--- a/t/101-atime/atime.do
+++ b/t/101-atime/atime.do
--- a/t/101-atime/atime2.do
+++ b/t/101-atime/atime2.do
--- a/t/101-atime/clean.do
+++ b/t/101-atime/clean.do
@ -0,0 +1 @@
 rm -f atime2 *~ .*~
--- a/t/101-atime/tick
+++ b/t/101-atime/tick
--- a/t/102-empty/.gitignore
+++ b/t/102-empty/.gitignore
@ -0,0 +1,3 @@
 touch1
 silence
 silence.do
--- a/t/102-empty/all.do
+++ b/t/102-empty/all.do
@ -0,0 +1 @@
 redo silencetest touchtest blank
--- a/t/102-empty/blank.do
+++ b/t/102-empty/blank.do
--- a/t/102-empty/clean.do
+++ b/t/102-empty/clean.do
@ -0,0 +1 @@
 rm -f touch1 *~ .*~
--- a/t/102-empty/silencetest.do
+++ b/t/102-empty/silencetest.do
@ -3,6 +3,6 @@ redo silence
 [ -e silence ] || exit 55
 echo 'true' >silence.do
 redo silence
-. ./skip-if-minimal-do.sh
+. ../skip-if-minimal-do.sh
 [ ! -e silence ] || exit 66
 rm -f silence.do
--- a/t/102-empty/touchtest.do
+++ b/t/102-empty/touchtest.do
--- a/t/103-unicode/all.do
+++ b/t/103-unicode/all.do
@ -0,0 +1 @@
 redo unicode
--- a/t/103-unicode/test-uniçøðë/test1.do
+++ b/t/103-unicode/test-uniçøðë/test1.do
--- a/t/103-unicode/unicode.do
+++ b/t/103-unicode/unicode.do
--- a/t/104-space/all.do
+++ b/t/104-space/all.do
@ -0,0 +1 @@
 redo "space dir/test"
--- a/t/104-space/clean.do
+++ b/t/104-space/clean.do
@ -0,0 +1 @@
 redo "space dir/clean"
--- a/t/104-space/space
+++ b/t/104-space/space
--- a/t/104-space/space
+++ b/t/104-space/space
--- a/t/104-space/space
+++ b/t/104-space/space
--- a/t/104-space/space
+++ b/t/104-space/space
--- a/t/104-space/space
+++ b/t/104-space/space
--- a/t/110-compile/.gitignore
+++ b/t/110-compile/.gitignore
@ -0,0 +1,5 @@
 CC
 LD
 [yb]ellow
 hello
 *.o
--- a/t/110-compile/CC.do
+++ b/t/110-compile/CC.do
--- a/t/110-compile/LD.do
+++ b/t/110-compile/LD.do
--- a/t/110-compile/all.do
+++ b/t/110-compile/all.do
@ -0,0 +1 @@
 redo-ifchange hello yellow bellow
--- a/t/110-compile/bellow.do
+++ b/t/110-compile/bellow.do
@ -1,3 +1,3 @@
 redo-ifchange LD yellow.o
 ./LD "$3" yellow.o
-./sleep 2
+../sleep 2
--- a/t/110-compile/clean.do
+++ b/t/110-compile/clean.do
@ -0,0 +1,3 @@
 rm -f hello [by]ellow *.o CC LD *~ .*~
--- a/t/110-compile/hello.c
+++ b/t/110-compile/hello.c
--- a/t/110-compile/hello.do
+++ b/t/110-compile/hello.do
@ -1,3 +1,3 @@
 redo-ifchange LD hello.o
-./sleep 1
+../sleep 1
 ./LD "$3" hello.o
--- a/t/110-compile/hello.o.do
+++ b/t/110-compile/hello.o.do
@ -1,4 +1,4 @@
 redo-ifchange CC hello.c /usr/include/stdio.h
 redo-ifcreate stdio.h
-./sleep 3
+../sleep 3
 ./CC hello.c
--- a/t/110-compile/yellow.do
+++ b/t/110-compile/yellow.do
@ -1,3 +1,3 @@
 redo-ifchange LD yellow.o
-./sleep 1.5
+../sleep 1.5
 ./LD "$3" yellow.o
--- a/t/110-compile/yellow.o.do
+++ b/t/110-compile/yellow.o.do
@ -1,3 +1,3 @@
 redo-ifchange CC hello.c
-./sleep 2
+../sleep 2
 gcc -o $3 -c hello.c
--- a/t/111-compile/.gitignore
+++ b/t/111-compile/.gitignore
--- a/t/111-compile/CC.do
+++ b/t/111-compile/CC.do
--- a/t/111-compile/Makefile
+++ b/t/111-compile/Makefile
--- a/t/111-compile/all.do
+++ b/t/111-compile/all.do
--- a/t/111-compile/clean.do
+++ b/t/111-compile/clean.do
--- a/t/111-compile/config.sh
+++ b/t/111-compile/config.sh
--- a/t/111-compile/default.o.do
+++ b/t/111-compile/default.o.do
--- a/t/111-compile/hello.do
+++ b/t/111-compile/hello.do
--- a/t/111-compile/main.c
+++ b/t/111-compile/main.c
--- a/t/111-compile/mystr.c
+++ b/t/111-compile/mystr.c
--- a/t/111-compile/mystr.h
+++ b/t/111-compile/mystr.h
--- a/t/120-defaults-flat/.gitignore
+++ b/t/120-defaults-flat/.gitignore
--- a/t/120-defaults-flat/all.do
+++ b/t/120-defaults-flat/all.do
--- a/t/120-defaults-flat/c.c.c.b.b.a
+++ b/t/120-defaults-flat/c.c.c.b.b.a
--- a/t/120-defaults-flat/c.do
+++ b/t/120-defaults-flat/c.do
--- a/t/120-defaults-flat/clean.do
+++ b/t/120-defaults-flat/clean.do
--- a/t/120-defaults-flat/default.b.do
+++ b/t/120-defaults-flat/default.b.do
--- a/t/120-defaults-flat/default.c.c.do
+++ b/t/120-defaults-flat/default.c.c.do
--- a/t/120-defaults-flat/default.c.do
+++ b/t/120-defaults-flat/default.c.do
--- a/t/120-defaults-flat/default.do
+++ b/t/120-defaults-flat/default.do
--- a/t/121-defaults-nested/.gitignore
+++ b/t/121-defaults-nested/.gitignore
--- a/t/121-defaults-nested/a/b/default.y.z.do
+++ b/t/121-defaults-nested/a/b/default.y.z.do
--- a/t/121-defaults-nested/a/b/file.x.y.z.do
+++ b/t/121-defaults-nested/a/b/file.x.y.z.do
--- a/t/121-defaults-nested/a/d/default.do
+++ b/t/121-defaults-nested/a/d/default.do
--- a/t/121-defaults-nested/a/default.x.y.z.do
+++ b/t/121-defaults-nested/a/default.x.y.z.do
--- a/t/121-defaults-nested/a/default.z.do
+++ b/t/121-defaults-nested/a/default.z.do
--- a/t/121-defaults-nested/all.do
+++ b/t/121-defaults-nested/all.do
--- a/t/121-defaults-nested/clean.do
+++ b/t/121-defaults-nested/clean.do
--- a/t/121-defaults-nested/default.do
+++ b/t/121-defaults-nested/default.do
--- a/t/121-defaults-nested/test.do
+++ b/t/121-defaults-nested/test.do
--- a/t/130-mode/.gitignore
+++ b/t/130-mode/.gitignore
@ -0,0 +1 @@
 mode1
--- a/t/130-mode/all.do
+++ b/t/130-mode/all.do
--- a/t/130-mode/clean.do
+++ b/t/130-mode/clean.do
@ -0,0 +1 @@
 rm -f mode1 *~ .*~
--- a/t/130-mode/mode1.do
+++ b/t/130-mode/mode1.do
--- a/t/200-shell/.gitignore
+++ b/t/200-shell/.gitignore
@ -0,0 +1,2 @@
 /nonshelltest
 /chicken.vartest
--- a/t/200-shell/all.do
+++ b/t/200-shell/all.do
@ -0,0 +1,2 @@
 redo nonshelltest shelltest vartest
--- a/t/200-shell/clean.do
+++ b/t/200-shell/clean.do
@ -0,0 +1 @@
 rm -f broken nonshelltest shellfile chicken.vartest *~ .*~
--- a/t/200-shell/default.vartest.do
+++ b/t/200-shell/default.vartest.do
--- a/t/200-shell/nonshelltest.do
+++ b/t/200-shell/nonshelltest.do
--- a/t/200-shell/shelltest.do
+++ b/t/200-shell/shelltest.do
@ -1,5 +1,6 @@
 set +e
 export SHELLTEST_QUIET=1
 cd ..
 ( . ./shelltest.od )
 RV=$?
 case $RV in
--- a/t/200-shell/vartest.do
+++ b/t/200-shell/vartest.do
--- a/t/201-fail/.gitignore
+++ b/t/201-fail/.gitignore
--- a/t/201-fail/all.do
+++ b/t/201-fail/all.do
--- a/t/201-fail/clean.do
+++ b/t/201-fail/clean.do
--- a/t/201-fail/fail.do
+++ b/t/201-fail/fail.do
--- a/t/202-del/.gitignore
+++ b/t/202-del/.gitignore
@ -0,0 +1 @@
 deltest2
--- a/t/202-del/all.do
+++ b/t/202-del/all.do
@ -0,0 +1 @@
 redo deltest deltest2
--- a/t/202-del/clean.do
+++ b/t/202-del/clean.do
@ -0,0 +1 @@
 rm -f deltest2 *~ .*~
--- a/t/202-del/deltest.do
+++ b/t/202-del/deltest.do
--- a/t/202-del/deltest2.do
+++ b/t/202-del/deltest2.do
--- a/t/220-ifcreate/.gitignore
+++ b/t/220-ifcreate/.gitignore
@ -0,0 +1 @@
 ifcreate?.log
--- a/t/220-ifcreate/all.do
+++ b/t/220-ifcreate/all.do
@ -1,5 +1,5 @@
 rm -f exists ifcreate[12] ifcreate[12].log ifcreate[12].dep
-. ./skip-if-minimal-do.sh
+. ../skip-if-minimal-do.sh
 touch exists
 redo-ifcreate exists 2>/dev/null && exit 91
 rm exists
@ -10,11 +10,11 @@ for d in 1 2; do
 	[ "$(wc -l <ifcreate$d.log)" -eq 1 ] || exit ${d}1
 	redo-ifchange ifcreate$d
 	[ "$(wc -l <ifcreate$d.log)" -eq 1 ] || exit ${d}2
-	./flush-cache
+	../flush-cache
 	touch ifcreate$d.dep
 	redo-ifchange ifcreate$d
 	[ "$(wc -l <ifcreate$d.log)" -eq 2 ] || exit ${d}3
-	./flush-cache
+	../flush-cache
 	rm ifcreate$d.dep
 	redo-ifchange ifcreate$d
 	[ "$(wc -l <ifcreate$d.log)" -eq 3 ] || exit ${d}4
--- a/t/220-ifcreate/clean.do
+++ b/t/220-ifcreate/clean.do
@ -0,0 +1 @@
 rm -f ifcreate?.log *~ .*~
--- a/t/220-ifcreate/ifcreate1.do
+++ b/t/220-ifcreate/ifcreate1.do
--- a/t/220-ifcreate/ifcreate2.do
+++ b/t/220-ifcreate/ifcreate2.do
@ -0,0 +1,7 @@
 cd ..
 if [ -e 220-ifcreate/ifcreate2.dep ]; then
 	redo-ifchange 220-ifcreate/ifcreate2.dep
 else
 	redo-ifcreate 220-ifcreate/ifcreate2.dep
 fi
 echo $$ >>220-ifcreate/ifcreate2.log
--- a/t/250-makedir/.gitignore
+++ b/t/250-makedir/.gitignore
@ -0,0 +1,2 @@
 makedir.log
 makedir
--- a/t/250-makedir/all.do
+++ b/t/250-makedir/all.do
@ -0,0 +1 @@
 redo makedir2 dirtest/all autosubdir/all
--- a/t/250-makedir/autosubdir/all.do
+++ b/t/250-makedir/autosubdir/all.do
--- a/Show more
+++ b/Show more
		`@ -0,0 +1 @@`
							`rm -f broken nonshelltest shellfile chicken.vartest ~ .~`