From 7822f5a5bbadd41e6cb5e1fd1673140a8b13fe24 Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Wed, 8 Feb 2012 00:33:00 -0500 Subject: [PATCH] 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. --- .gitignore | 7 +------ t/.gitignore | 20 ------------------- t/100-args/.gitignore | 1 + t/100-args/all.do | 1 + t/100-args/clean.do | 1 + t/{ => 100-args}/default.args.do | 0 t/{ => 100-args}/passfail.do | 0 t/{ => 100-args}/passfailtest.do | 2 +- t/{ => 100-args}/test2.args.do | 0 t/101-atime/.gitignore | 1 + t/101-atime/all.do | 1 + t/{ => 101-atime}/atime.do | 0 t/{ => 101-atime}/atime2.do | 0 t/101-atime/clean.do | 1 + t/{ => 101-atime}/tick | 0 t/102-empty/.gitignore | 3 +++ t/102-empty/all.do | 1 + t/{blank => 102-empty}/blank.do | 0 t/102-empty/clean.do | 1 + t/{ => 102-empty}/silencetest.do | 2 +- t/{ => 102-empty}/touchtest.do | 0 t/103-unicode/all.do | 1 + t/{ => 103-unicode}/test-uniçøðë/test1.do | 0 t/{ => 103-unicode}/unicode.do | 0 t/104-space/all.do | 1 + t/104-space/clean.do | 1 + t/{ => 104-space}/space dir/.gitignore | 0 t/{ => 104-space}/space dir/clean.do | 0 t/{ => 104-space}/space dir/space 2.do | 0 t/{ => 104-space}/space dir/space file.do | 0 t/{ => 104-space}/space dir/test.do | 0 t/110-compile/.gitignore | 5 +++++ t/{ => 110-compile}/CC.do | 0 t/{ => 110-compile}/LD.do | 0 t/110-compile/all.do | 1 + t/{ => 110-compile}/bellow.do | 2 +- t/110-compile/clean.do | 3 +++ t/{ => 110-compile}/hello.c | 0 t/{ => 110-compile}/hello.do | 2 +- t/{ => 110-compile}/hello.o.do | 2 +- t/{ => 110-compile}/yellow.do | 2 +- t/{ => 110-compile}/yellow.o.do | 2 +- t/{example => 111-compile}/.gitignore | 0 t/{example => 111-compile}/CC.do | 0 t/{example => 111-compile}/Makefile | 0 t/{example => 111-compile}/all.do | 0 t/{example => 111-compile}/clean.do | 0 t/{example => 111-compile}/config.sh | 0 t/{example => 111-compile}/default.o.do | 0 t/{example => 111-compile}/hello.do | 0 t/{example => 111-compile}/main.c | 0 t/{example => 111-compile}/mystr.c | 0 t/{example => 111-compile}/mystr.h | 0 .../.gitignore | 0 t/{defaults-flat => 120-defaults-flat}/all.do | 0 .../c.c.c.b.b.a | 0 t/{defaults-flat => 120-defaults-flat}/c.do | 0 .../clean.do | 0 .../default.b.do | 0 .../default.c.c.do | 0 .../default.c.do | 0 .../default.do | 0 .../.gitignore | 0 .../a/b/default.y.z.do | 0 .../a/b/file.x.y.z.do | 0 .../a/d/default.do | 0 .../a/default.x.y.z.do | 0 .../a/default.z.do | 0 .../all.do | 0 .../clean.do | 0 .../default.do | 0 .../test.do | 0 t/130-mode/.gitignore | 1 + t/{modetest.do => 130-mode/all.do} | 0 t/130-mode/clean.do | 1 + t/{ => 130-mode}/mode1.do | 0 t/200-shell/.gitignore | 2 ++ t/200-shell/all.do | 2 ++ t/200-shell/clean.do | 1 + t/{ => 200-shell}/default.vartest.do | 0 t/{ => 200-shell}/nonshelltest.do | 0 t/{ => 200-shell}/shelltest.do | 1 + t/{ => 200-shell}/vartest.do | 0 t/{fail => 201-fail}/.gitignore | 0 t/{fail/test.do => 201-fail/all.do} | 0 t/{fail => 201-fail}/clean.do | 0 t/{fail => 201-fail}/fail.do | 0 t/202-del/.gitignore | 1 + t/202-del/all.do | 1 + t/202-del/clean.do | 1 + t/{ => 202-del}/deltest.do | 0 t/{ => 202-del}/deltest2.do | 0 t/220-ifcreate/.gitignore | 1 + t/{ifcreate-test.do => 220-ifcreate/all.do} | 6 +++--- t/220-ifcreate/clean.do | 1 + t/{ => 220-ifcreate}/ifcreate1.do | 0 t/220-ifcreate/ifcreate2.do | 7 +++++++ t/250-makedir/.gitignore | 2 ++ t/250-makedir/all.do | 1 + .../test.do => 250-makedir/autosubdir/all.do} | 0 t/{ => 250-makedir}/autosubdir/clean.do | 0 t/{ => 250-makedir}/autosubdir/default.txt.do | 0 t/250-makedir/clean.do | 4 ++++ t/{deps => 250-makedir}/dirtest/.gitignore | 0 .../test.do => 250-makedir/dirtest/all.do} | 0 t/{deps => 250-makedir}/dirtest/clean.do | 0 t/{deps => 250-makedir}/dirtest/dir1/go.do | 0 .../dirtest/dir1/stinky.do | 0 t/{deps => 250-makedir}/dirtest/t1.do | 0 t/{ => 250-makedir}/makedir.do | 0 t/{ => 250-makedir}/makedir2.do | 2 +- t/{deps => 350-deps}/.gitignore | 0 t/{deps/test.do => 350-deps/all.do} | 2 +- t/{deps => 350-deps}/basic/.gitignore | 0 t/{deps => 350-deps}/basic/1.in | 0 t/{deps => 350-deps}/basic/2.in | 0 t/{deps => 350-deps}/basic/clean.do | 0 t/{deps => 350-deps}/basic/default.out.do | 0 t/{deps => 350-deps}/basic/test.do | 0 t/{deps => 350-deps}/broken.do | 0 t/{deps => 350-deps}/clean.do | 0 t/{deps => 350-deps}/doublestatic.do | 0 t/{deps => 350-deps}/genfile1.do | 0 t/{deps => 350-deps}/gentest.do | 0 t/{deps => 350-deps}/ifchange-fail.do | 0 t/{deps => 350-deps}/overwrite.do | 0 t/{deps => 350-deps}/overwrite1.do | 0 t/{deps => 350-deps}/overwrite2.do | 0 t/{deps => 350-deps}/overwrite3.do | 0 t/{deps => 350-deps}/static.in | 0 t/{deps => 350-deps}/static1.do | 0 t/{deps => 350-deps}/static2.do | 0 t/{deps => 350-deps}/t1a.do | 0 t/{deps => 350-deps}/t1dep.do | 0 t/{deps => 350-deps}/t2.do | 0 t/{deps => 350-deps}/test1.do | 0 t/{deps => 350-deps}/test2.do | 0 t/550-chdir/.gitignore | 1 + t/{chdirtest.do => 550-chdir/all.do} | 8 ++++---- t/{ => 550-chdir}/chdir1.do | 0 t/{ => 550-chdir}/chdir2.do | 2 +- t/{ => 550-chdir}/chdir3.do | 2 +- t/550-chdir/clean.do | 1 + t/640-always/.gitignore | 2 ++ t/{alwaystest.do => 640-always/all.do} | 16 +++++++-------- t/{ => 640-always}/always1.do | 0 t/640-always/clean.do | 2 ++ t/{stamp => 660-stamp}/.gitignore | 0 t/{stamp/test.do => 660-stamp/all.do} | 0 t/{stamp => 660-stamp}/bob.do | 0 t/{stamp => 660-stamp}/clean.do | 0 t/{stamp => 660-stamp}/stamptest.do | 0 t/{stamp => 660-stamp}/stampy.do | 2 +- t/{stamp => 660-stamp}/usestamp.do | 0 t/{stamp => 660-stamp}/usestamp2.do | 0 t/{curse => 950-curse}/.gitignore | 0 t/{curse/test.do => 950-curse/all.do} | 0 t/{curse => 950-curse}/check-1.sh | 0 t/{curse => 950-curse}/check-2.sh | 0 t/{curse => 950-curse}/clean.do | 0 t/{curse => 950-curse}/countall.do | 0 t/{curse => 950-curse}/default.n0.do | 0 t/{curse => 950-curse}/default.n1.do | 0 t/{curse => 950-curse}/default.n2.do | 0 t/{curse => 950-curse}/seq | 0 t/all.do | 12 +++++++++-- t/clean.do | 13 +++++------- t/ifcreate2.do | 7 ------- t/test.do | 9 --------- test.do | 2 +- 170 files changed, 100 insertions(+), 80 deletions(-) create mode 100644 t/100-args/.gitignore create mode 100644 t/100-args/all.do create mode 100644 t/100-args/clean.do rename t/{ => 100-args}/default.args.do (100%) rename t/{ => 100-args}/passfail.do (100%) rename t/{ => 100-args}/passfailtest.do (91%) rename t/{ => 100-args}/test2.args.do (100%) create mode 100644 t/101-atime/.gitignore create mode 100644 t/101-atime/all.do rename t/{ => 101-atime}/atime.do (100%) rename t/{ => 101-atime}/atime2.do (100%) create mode 100644 t/101-atime/clean.do rename t/{ => 101-atime}/tick (100%) create mode 100644 t/102-empty/.gitignore create mode 100644 t/102-empty/all.do rename t/{blank => 102-empty}/blank.do (100%) create mode 100644 t/102-empty/clean.do rename t/{ => 102-empty}/silencetest.do (84%) rename t/{ => 102-empty}/touchtest.do (100%) create mode 100644 t/103-unicode/all.do rename t/{ => 103-unicode}/test-uniçøðë/test1.do (100%) rename t/{ => 103-unicode}/unicode.do (100%) create mode 100644 t/104-space/all.do create mode 100644 t/104-space/clean.do rename t/{ => 104-space}/space dir/.gitignore (100%) rename t/{ => 104-space}/space dir/clean.do (100%) rename t/{ => 104-space}/space dir/space 2.do (100%) rename t/{ => 104-space}/space dir/space file.do (100%) rename t/{ => 104-space}/space dir/test.do (100%) create mode 100644 t/110-compile/.gitignore rename t/{ => 110-compile}/CC.do (100%) rename t/{ => 110-compile}/LD.do (100%) create mode 100644 t/110-compile/all.do rename t/{ => 110-compile}/bellow.do (80%) create mode 100644 t/110-compile/clean.do rename t/{ => 110-compile}/hello.c (100%) rename t/{ => 110-compile}/hello.do (79%) rename t/{ => 110-compile}/hello.o.do (88%) rename t/{ => 110-compile}/yellow.do (77%) rename t/{ => 110-compile}/yellow.o.do (80%) rename t/{example => 111-compile}/.gitignore (100%) rename t/{example => 111-compile}/CC.do (100%) rename t/{example => 111-compile}/Makefile (100%) rename t/{example => 111-compile}/all.do (100%) rename t/{example => 111-compile}/clean.do (100%) rename t/{example => 111-compile}/config.sh (100%) rename t/{example => 111-compile}/default.o.do (100%) rename t/{example => 111-compile}/hello.do (100%) rename t/{example => 111-compile}/main.c (100%) rename t/{example => 111-compile}/mystr.c (100%) rename t/{example => 111-compile}/mystr.h (100%) rename t/{defaults-flat => 120-defaults-flat}/.gitignore (100%) rename t/{defaults-flat => 120-defaults-flat}/all.do (100%) rename t/{defaults-flat => 120-defaults-flat}/c.c.c.b.b.a (100%) rename t/{defaults-flat => 120-defaults-flat}/c.do (100%) rename t/{defaults-flat => 120-defaults-flat}/clean.do (100%) rename t/{defaults-flat => 120-defaults-flat}/default.b.do (100%) rename t/{defaults-flat => 120-defaults-flat}/default.c.c.do (100%) rename t/{defaults-flat => 120-defaults-flat}/default.c.do (100%) rename t/{defaults-flat => 120-defaults-flat}/default.do (100%) rename t/{defaults-nested => 121-defaults-nested}/.gitignore (100%) rename t/{defaults-nested => 121-defaults-nested}/a/b/default.y.z.do (100%) rename t/{defaults-nested => 121-defaults-nested}/a/b/file.x.y.z.do (100%) rename t/{defaults-nested => 121-defaults-nested}/a/d/default.do (100%) rename t/{defaults-nested => 121-defaults-nested}/a/default.x.y.z.do (100%) rename t/{defaults-nested => 121-defaults-nested}/a/default.z.do (100%) rename t/{defaults-nested => 121-defaults-nested}/all.do (100%) rename t/{defaults-nested => 121-defaults-nested}/clean.do (100%) rename t/{defaults-nested => 121-defaults-nested}/default.do (100%) rename t/{defaults-nested => 121-defaults-nested}/test.do (100%) create mode 100644 t/130-mode/.gitignore rename t/{modetest.do => 130-mode/all.do} (100%) create mode 100644 t/130-mode/clean.do rename t/{ => 130-mode}/mode1.do (100%) create mode 100644 t/200-shell/.gitignore create mode 100644 t/200-shell/all.do create mode 100644 t/200-shell/clean.do rename t/{ => 200-shell}/default.vartest.do (100%) rename t/{ => 200-shell}/nonshelltest.do (100%) rename t/{ => 200-shell}/shelltest.do (95%) rename t/{ => 200-shell}/vartest.do (100%) rename t/{fail => 201-fail}/.gitignore (100%) rename t/{fail/test.do => 201-fail/all.do} (100%) rename t/{fail => 201-fail}/clean.do (100%) rename t/{fail => 201-fail}/fail.do (100%) create mode 100644 t/202-del/.gitignore create mode 100644 t/202-del/all.do create mode 100644 t/202-del/clean.do rename t/{ => 202-del}/deltest.do (100%) rename t/{ => 202-del}/deltest2.do (100%) create mode 100644 t/220-ifcreate/.gitignore rename t/{ifcreate-test.do => 220-ifcreate/all.do} (89%) create mode 100644 t/220-ifcreate/clean.do rename t/{ => 220-ifcreate}/ifcreate1.do (100%) create mode 100644 t/220-ifcreate/ifcreate2.do create mode 100644 t/250-makedir/.gitignore create mode 100644 t/250-makedir/all.do rename t/{autosubdir/test.do => 250-makedir/autosubdir/all.do} (100%) rename t/{ => 250-makedir}/autosubdir/clean.do (100%) rename t/{ => 250-makedir}/autosubdir/default.txt.do (100%) create mode 100644 t/250-makedir/clean.do rename t/{deps => 250-makedir}/dirtest/.gitignore (100%) rename t/{deps/dirtest/test.do => 250-makedir/dirtest/all.do} (100%) rename t/{deps => 250-makedir}/dirtest/clean.do (100%) rename t/{deps => 250-makedir}/dirtest/dir1/go.do (100%) rename t/{deps => 250-makedir}/dirtest/dir1/stinky.do (100%) rename t/{deps => 250-makedir}/dirtest/t1.do (100%) rename t/{ => 250-makedir}/makedir.do (100%) rename t/{ => 250-makedir}/makedir2.do (89%) rename t/{deps => 350-deps}/.gitignore (100%) rename t/{deps/test.do => 350-deps/all.do} (72%) rename t/{deps => 350-deps}/basic/.gitignore (100%) rename t/{deps => 350-deps}/basic/1.in (100%) rename t/{deps => 350-deps}/basic/2.in (100%) rename t/{deps => 350-deps}/basic/clean.do (100%) rename t/{deps => 350-deps}/basic/default.out.do (100%) rename t/{deps => 350-deps}/basic/test.do (100%) rename t/{deps => 350-deps}/broken.do (100%) rename t/{deps => 350-deps}/clean.do (100%) rename t/{deps => 350-deps}/doublestatic.do (100%) rename t/{deps => 350-deps}/genfile1.do (100%) rename t/{deps => 350-deps}/gentest.do (100%) rename t/{deps => 350-deps}/ifchange-fail.do (100%) rename t/{deps => 350-deps}/overwrite.do (100%) rename t/{deps => 350-deps}/overwrite1.do (100%) rename t/{deps => 350-deps}/overwrite2.do (100%) rename t/{deps => 350-deps}/overwrite3.do (100%) rename t/{deps => 350-deps}/static.in (100%) rename t/{deps => 350-deps}/static1.do (100%) rename t/{deps => 350-deps}/static2.do (100%) rename t/{deps => 350-deps}/t1a.do (100%) rename t/{deps => 350-deps}/t1dep.do (100%) rename t/{deps => 350-deps}/t2.do (100%) rename t/{deps => 350-deps}/test1.do (100%) rename t/{deps => 350-deps}/test2.do (100%) create mode 100644 t/550-chdir/.gitignore rename t/{chdirtest.do => 550-chdir/all.do} (71%) rename t/{ => 550-chdir}/chdir1.do (100%) rename t/{ => 550-chdir}/chdir2.do (71%) rename t/{ => 550-chdir}/chdir3.do (71%) create mode 100644 t/550-chdir/clean.do create mode 100644 t/640-always/.gitignore rename t/{alwaystest.do => 640-always/all.do} (71%) rename t/{ => 640-always}/always1.do (100%) create mode 100644 t/640-always/clean.do rename t/{stamp => 660-stamp}/.gitignore (100%) rename t/{stamp/test.do => 660-stamp/all.do} (100%) rename t/{stamp => 660-stamp}/bob.do (100%) rename t/{stamp => 660-stamp}/clean.do (100%) rename t/{stamp => 660-stamp}/stamptest.do (100%) rename t/{stamp => 660-stamp}/stampy.do (68%) rename t/{stamp => 660-stamp}/usestamp.do (100%) rename t/{stamp => 660-stamp}/usestamp2.do (100%) rename t/{curse => 950-curse}/.gitignore (100%) rename t/{curse/test.do => 950-curse/all.do} (100%) rename t/{curse => 950-curse}/check-1.sh (100%) rename t/{curse => 950-curse}/check-2.sh (100%) rename t/{curse => 950-curse}/clean.do (100%) rename t/{curse => 950-curse}/countall.do (100%) rename t/{curse => 950-curse}/default.n0.do (100%) rename t/{curse => 950-curse}/default.n1.do (100%) rename t/{curse => 950-curse}/default.n2.do (100%) rename t/{curse => 950-curse}/seq (100%) delete mode 100644 t/ifcreate2.do delete mode 100644 t/test.do diff --git a/.gitignore b/.gitignore index 4a9ab4a..a205373 100644 --- 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 diff --git a/t/.gitignore b/t/.gitignore index 39e2520..bf9e4ed 100644 --- 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 diff --git a/t/100-args/.gitignore b/t/100-args/.gitignore new file mode 100644 index 0000000..020cf06 --- /dev/null +++ b/t/100-args/.gitignore @@ -0,0 +1 @@ +passfail diff --git a/t/100-args/all.do b/t/100-args/all.do new file mode 100644 index 0000000..bd750d9 --- /dev/null +++ b/t/100-args/all.do @@ -0,0 +1 @@ +redo test.args test2.args passfailtest diff --git a/t/100-args/clean.do b/t/100-args/clean.do new file mode 100644 index 0000000..655f41d --- /dev/null +++ b/t/100-args/clean.do @@ -0,0 +1 @@ +rm -f passfail *~ .*~ diff --git a/t/default.args.do b/t/100-args/default.args.do similarity index 100% rename from t/default.args.do rename to t/100-args/default.args.do diff --git a/t/passfail.do b/t/100-args/passfail.do similarity index 100% rename from t/passfail.do rename to t/100-args/passfail.do diff --git a/t/passfailtest.do b/t/100-args/passfailtest.do similarity index 91% rename from t/passfailtest.do rename to t/100-args/passfailtest.do index d717f05..b27c096 100644 --- a/t/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 diff --git a/t/test2.args.do b/t/100-args/test2.args.do similarity index 100% rename from t/test2.args.do rename to t/100-args/test2.args.do diff --git a/t/101-atime/.gitignore b/t/101-atime/.gitignore new file mode 100644 index 0000000..ec08e49 --- /dev/null +++ b/t/101-atime/.gitignore @@ -0,0 +1 @@ +atime2 diff --git a/t/101-atime/all.do b/t/101-atime/all.do new file mode 100644 index 0000000..082ab7a --- /dev/null +++ b/t/101-atime/all.do @@ -0,0 +1 @@ +redo atime diff --git a/t/atime.do b/t/101-atime/atime.do similarity index 100% rename from t/atime.do rename to t/101-atime/atime.do diff --git a/t/atime2.do b/t/101-atime/atime2.do similarity index 100% rename from t/atime2.do rename to t/101-atime/atime2.do diff --git a/t/101-atime/clean.do b/t/101-atime/clean.do new file mode 100644 index 0000000..0e3ea5a --- /dev/null +++ b/t/101-atime/clean.do @@ -0,0 +1 @@ +rm -f atime2 *~ .*~ diff --git a/t/tick b/t/101-atime/tick similarity index 100% rename from t/tick rename to t/101-atime/tick diff --git a/t/102-empty/.gitignore b/t/102-empty/.gitignore new file mode 100644 index 0000000..4cc290b --- /dev/null +++ b/t/102-empty/.gitignore @@ -0,0 +1,3 @@ +touch1 +silence +silence.do diff --git a/t/102-empty/all.do b/t/102-empty/all.do new file mode 100644 index 0000000..6404c98 --- /dev/null +++ b/t/102-empty/all.do @@ -0,0 +1 @@ +redo silencetest touchtest blank diff --git a/t/blank/blank.do b/t/102-empty/blank.do similarity index 100% rename from t/blank/blank.do rename to t/102-empty/blank.do diff --git a/t/102-empty/clean.do b/t/102-empty/clean.do new file mode 100644 index 0000000..d8246d9 --- /dev/null +++ b/t/102-empty/clean.do @@ -0,0 +1 @@ +rm -f touch1 *~ .*~ diff --git a/t/silencetest.do b/t/102-empty/silencetest.do similarity index 84% rename from t/silencetest.do rename to t/102-empty/silencetest.do index 2b3de77..b0e7c9e 100644 --- a/t/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 diff --git a/t/touchtest.do b/t/102-empty/touchtest.do similarity index 100% rename from t/touchtest.do rename to t/102-empty/touchtest.do diff --git a/t/103-unicode/all.do b/t/103-unicode/all.do new file mode 100644 index 0000000..e76c907 --- /dev/null +++ b/t/103-unicode/all.do @@ -0,0 +1 @@ +redo unicode diff --git a/t/test-uniçøðë/test1.do b/t/103-unicode/test-uniçøðë/test1.do similarity index 100% rename from t/test-uniçøðë/test1.do rename to t/103-unicode/test-uniçøðë/test1.do diff --git a/t/unicode.do b/t/103-unicode/unicode.do similarity index 100% rename from t/unicode.do rename to t/103-unicode/unicode.do diff --git a/t/104-space/all.do b/t/104-space/all.do new file mode 100644 index 0000000..c5c576a --- /dev/null +++ b/t/104-space/all.do @@ -0,0 +1 @@ +redo "space dir/test" diff --git a/t/104-space/clean.do b/t/104-space/clean.do new file mode 100644 index 0000000..b5cfeff --- /dev/null +++ b/t/104-space/clean.do @@ -0,0 +1 @@ +redo "space dir/clean" diff --git a/t/space dir/.gitignore b/t/104-space/space dir/.gitignore similarity index 100% rename from t/space dir/.gitignore rename to t/104-space/space dir/.gitignore diff --git a/t/space dir/clean.do b/t/104-space/space dir/clean.do similarity index 100% rename from t/space dir/clean.do rename to t/104-space/space dir/clean.do diff --git a/t/space dir/space 2.do b/t/104-space/space dir/space 2.do similarity index 100% rename from t/space dir/space 2.do rename to t/104-space/space dir/space 2.do diff --git a/t/space dir/space file.do b/t/104-space/space dir/space file.do similarity index 100% rename from t/space dir/space file.do rename to t/104-space/space dir/space file.do diff --git a/t/space dir/test.do b/t/104-space/space dir/test.do similarity index 100% rename from t/space dir/test.do rename to t/104-space/space dir/test.do diff --git a/t/110-compile/.gitignore b/t/110-compile/.gitignore new file mode 100644 index 0000000..84e64ab --- /dev/null +++ b/t/110-compile/.gitignore @@ -0,0 +1,5 @@ +CC +LD +[yb]ellow +hello +*.o diff --git a/t/CC.do b/t/110-compile/CC.do similarity index 100% rename from t/CC.do rename to t/110-compile/CC.do diff --git a/t/LD.do b/t/110-compile/LD.do similarity index 100% rename from t/LD.do rename to t/110-compile/LD.do diff --git a/t/110-compile/all.do b/t/110-compile/all.do new file mode 100644 index 0000000..a94ac31 --- /dev/null +++ b/t/110-compile/all.do @@ -0,0 +1 @@ +redo-ifchange hello yellow bellow diff --git a/t/bellow.do b/t/110-compile/bellow.do similarity index 80% rename from t/bellow.do rename to t/110-compile/bellow.do index a308c5c..2d8ac7d 100644 --- a/t/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 diff --git a/t/110-compile/clean.do b/t/110-compile/clean.do new file mode 100644 index 0000000..13e374b --- /dev/null +++ b/t/110-compile/clean.do @@ -0,0 +1,3 @@ +rm -f hello [by]ellow *.o CC LD *~ .*~ + + diff --git a/t/hello.c b/t/110-compile/hello.c similarity index 100% rename from t/hello.c rename to t/110-compile/hello.c diff --git a/t/hello.do b/t/110-compile/hello.do similarity index 79% rename from t/hello.do rename to t/110-compile/hello.do index c1bb472..b5ef466 100644 --- a/t/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 diff --git a/t/hello.o.do b/t/110-compile/hello.o.do similarity index 88% rename from t/hello.o.do rename to t/110-compile/hello.o.do index ae44f5b..0b46cff 100644 --- a/t/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 diff --git a/t/yellow.do b/t/110-compile/yellow.do similarity index 77% rename from t/yellow.do rename to t/110-compile/yellow.do index 752818d..36609ff 100644 --- a/t/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 diff --git a/t/yellow.o.do b/t/110-compile/yellow.o.do similarity index 80% rename from t/yellow.o.do rename to t/110-compile/yellow.o.do index a8101e5..8769f56 100644 --- a/t/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 diff --git a/t/example/.gitignore b/t/111-compile/.gitignore similarity index 100% rename from t/example/.gitignore rename to t/111-compile/.gitignore diff --git a/t/example/CC.do b/t/111-compile/CC.do similarity index 100% rename from t/example/CC.do rename to t/111-compile/CC.do diff --git a/t/example/Makefile b/t/111-compile/Makefile similarity index 100% rename from t/example/Makefile rename to t/111-compile/Makefile diff --git a/t/example/all.do b/t/111-compile/all.do similarity index 100% rename from t/example/all.do rename to t/111-compile/all.do diff --git a/t/example/clean.do b/t/111-compile/clean.do similarity index 100% rename from t/example/clean.do rename to t/111-compile/clean.do diff --git a/t/example/config.sh b/t/111-compile/config.sh similarity index 100% rename from t/example/config.sh rename to t/111-compile/config.sh diff --git a/t/example/default.o.do b/t/111-compile/default.o.do similarity index 100% rename from t/example/default.o.do rename to t/111-compile/default.o.do diff --git a/t/example/hello.do b/t/111-compile/hello.do similarity index 100% rename from t/example/hello.do rename to t/111-compile/hello.do diff --git a/t/example/main.c b/t/111-compile/main.c similarity index 100% rename from t/example/main.c rename to t/111-compile/main.c diff --git a/t/example/mystr.c b/t/111-compile/mystr.c similarity index 100% rename from t/example/mystr.c rename to t/111-compile/mystr.c diff --git a/t/example/mystr.h b/t/111-compile/mystr.h similarity index 100% rename from t/example/mystr.h rename to t/111-compile/mystr.h diff --git a/t/defaults-flat/.gitignore b/t/120-defaults-flat/.gitignore similarity index 100% rename from t/defaults-flat/.gitignore rename to t/120-defaults-flat/.gitignore diff --git a/t/defaults-flat/all.do b/t/120-defaults-flat/all.do similarity index 100% rename from t/defaults-flat/all.do rename to t/120-defaults-flat/all.do diff --git a/t/defaults-flat/c.c.c.b.b.a b/t/120-defaults-flat/c.c.c.b.b.a similarity index 100% rename from t/defaults-flat/c.c.c.b.b.a rename to t/120-defaults-flat/c.c.c.b.b.a diff --git a/t/defaults-flat/c.do b/t/120-defaults-flat/c.do similarity index 100% rename from t/defaults-flat/c.do rename to t/120-defaults-flat/c.do diff --git a/t/defaults-flat/clean.do b/t/120-defaults-flat/clean.do similarity index 100% rename from t/defaults-flat/clean.do rename to t/120-defaults-flat/clean.do diff --git a/t/defaults-flat/default.b.do b/t/120-defaults-flat/default.b.do similarity index 100% rename from t/defaults-flat/default.b.do rename to t/120-defaults-flat/default.b.do diff --git a/t/defaults-flat/default.c.c.do b/t/120-defaults-flat/default.c.c.do similarity index 100% rename from t/defaults-flat/default.c.c.do rename to t/120-defaults-flat/default.c.c.do diff --git a/t/defaults-flat/default.c.do b/t/120-defaults-flat/default.c.do similarity index 100% rename from t/defaults-flat/default.c.do rename to t/120-defaults-flat/default.c.do diff --git a/t/defaults-flat/default.do b/t/120-defaults-flat/default.do similarity index 100% rename from t/defaults-flat/default.do rename to t/120-defaults-flat/default.do diff --git a/t/defaults-nested/.gitignore b/t/121-defaults-nested/.gitignore similarity index 100% rename from t/defaults-nested/.gitignore rename to t/121-defaults-nested/.gitignore diff --git a/t/defaults-nested/a/b/default.y.z.do b/t/121-defaults-nested/a/b/default.y.z.do similarity index 100% rename from t/defaults-nested/a/b/default.y.z.do rename to t/121-defaults-nested/a/b/default.y.z.do diff --git a/t/defaults-nested/a/b/file.x.y.z.do b/t/121-defaults-nested/a/b/file.x.y.z.do similarity index 100% rename from t/defaults-nested/a/b/file.x.y.z.do rename to t/121-defaults-nested/a/b/file.x.y.z.do diff --git a/t/defaults-nested/a/d/default.do b/t/121-defaults-nested/a/d/default.do similarity index 100% rename from t/defaults-nested/a/d/default.do rename to t/121-defaults-nested/a/d/default.do diff --git a/t/defaults-nested/a/default.x.y.z.do b/t/121-defaults-nested/a/default.x.y.z.do similarity index 100% rename from t/defaults-nested/a/default.x.y.z.do rename to t/121-defaults-nested/a/default.x.y.z.do diff --git a/t/defaults-nested/a/default.z.do b/t/121-defaults-nested/a/default.z.do similarity index 100% rename from t/defaults-nested/a/default.z.do rename to t/121-defaults-nested/a/default.z.do diff --git a/t/defaults-nested/all.do b/t/121-defaults-nested/all.do similarity index 100% rename from t/defaults-nested/all.do rename to t/121-defaults-nested/all.do diff --git a/t/defaults-nested/clean.do b/t/121-defaults-nested/clean.do similarity index 100% rename from t/defaults-nested/clean.do rename to t/121-defaults-nested/clean.do diff --git a/t/defaults-nested/default.do b/t/121-defaults-nested/default.do similarity index 100% rename from t/defaults-nested/default.do rename to t/121-defaults-nested/default.do diff --git a/t/defaults-nested/test.do b/t/121-defaults-nested/test.do similarity index 100% rename from t/defaults-nested/test.do rename to t/121-defaults-nested/test.do diff --git a/t/130-mode/.gitignore b/t/130-mode/.gitignore new file mode 100644 index 0000000..64c1571 --- /dev/null +++ b/t/130-mode/.gitignore @@ -0,0 +1 @@ +mode1 \ No newline at end of file diff --git a/t/modetest.do b/t/130-mode/all.do similarity index 100% rename from t/modetest.do rename to t/130-mode/all.do diff --git a/t/130-mode/clean.do b/t/130-mode/clean.do new file mode 100644 index 0000000..defa28c --- /dev/null +++ b/t/130-mode/clean.do @@ -0,0 +1 @@ +rm -f mode1 *~ .*~ diff --git a/t/mode1.do b/t/130-mode/mode1.do similarity index 100% rename from t/mode1.do rename to t/130-mode/mode1.do diff --git a/t/200-shell/.gitignore b/t/200-shell/.gitignore new file mode 100644 index 0000000..17d5108 --- /dev/null +++ b/t/200-shell/.gitignore @@ -0,0 +1,2 @@ +/nonshelltest +/chicken.vartest diff --git a/t/200-shell/all.do b/t/200-shell/all.do new file mode 100644 index 0000000..39b791d --- /dev/null +++ b/t/200-shell/all.do @@ -0,0 +1,2 @@ +redo nonshelltest shelltest vartest + diff --git a/t/200-shell/clean.do b/t/200-shell/clean.do new file mode 100644 index 0000000..2598970 --- /dev/null +++ b/t/200-shell/clean.do @@ -0,0 +1 @@ +rm -f broken nonshelltest shellfile chicken.vartest *~ .*~ diff --git a/t/default.vartest.do b/t/200-shell/default.vartest.do similarity index 100% rename from t/default.vartest.do rename to t/200-shell/default.vartest.do diff --git a/t/nonshelltest.do b/t/200-shell/nonshelltest.do similarity index 100% rename from t/nonshelltest.do rename to t/200-shell/nonshelltest.do diff --git a/t/shelltest.do b/t/200-shell/shelltest.do similarity index 95% rename from t/shelltest.do rename to t/200-shell/shelltest.do index 2ec9277..b6e7059 100644 --- a/t/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 diff --git a/t/vartest.do b/t/200-shell/vartest.do similarity index 100% rename from t/vartest.do rename to t/200-shell/vartest.do diff --git a/t/fail/.gitignore b/t/201-fail/.gitignore similarity index 100% rename from t/fail/.gitignore rename to t/201-fail/.gitignore diff --git a/t/fail/test.do b/t/201-fail/all.do similarity index 100% rename from t/fail/test.do rename to t/201-fail/all.do diff --git a/t/fail/clean.do b/t/201-fail/clean.do similarity index 100% rename from t/fail/clean.do rename to t/201-fail/clean.do diff --git a/t/fail/fail.do b/t/201-fail/fail.do similarity index 100% rename from t/fail/fail.do rename to t/201-fail/fail.do diff --git a/t/202-del/.gitignore b/t/202-del/.gitignore new file mode 100644 index 0000000..5fbfe70 --- /dev/null +++ b/t/202-del/.gitignore @@ -0,0 +1 @@ +deltest2 diff --git a/t/202-del/all.do b/t/202-del/all.do new file mode 100644 index 0000000..da01d62 --- /dev/null +++ b/t/202-del/all.do @@ -0,0 +1 @@ +redo deltest deltest2 diff --git a/t/202-del/clean.do b/t/202-del/clean.do new file mode 100644 index 0000000..146f645 --- /dev/null +++ b/t/202-del/clean.do @@ -0,0 +1 @@ +rm -f deltest2 *~ .*~ diff --git a/t/deltest.do b/t/202-del/deltest.do similarity index 100% rename from t/deltest.do rename to t/202-del/deltest.do diff --git a/t/deltest2.do b/t/202-del/deltest2.do similarity index 100% rename from t/deltest2.do rename to t/202-del/deltest2.do diff --git a/t/220-ifcreate/.gitignore b/t/220-ifcreate/.gitignore new file mode 100644 index 0000000..c8b781d --- /dev/null +++ b/t/220-ifcreate/.gitignore @@ -0,0 +1 @@ +ifcreate?.log diff --git a/t/ifcreate-test.do b/t/220-ifcreate/all.do similarity index 89% rename from t/ifcreate-test.do rename to t/220-ifcreate/all.do index e94c7ad..8838f29 100644 --- a/t/ifcreate-test.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 >220-ifcreate/ifcreate2.log diff --git a/t/250-makedir/.gitignore b/t/250-makedir/.gitignore new file mode 100644 index 0000000..dbfb130 --- /dev/null +++ b/t/250-makedir/.gitignore @@ -0,0 +1,2 @@ +makedir.log +makedir diff --git a/t/250-makedir/all.do b/t/250-makedir/all.do new file mode 100644 index 0000000..c9d5413 --- /dev/null +++ b/t/250-makedir/all.do @@ -0,0 +1 @@ +redo makedir2 dirtest/all autosubdir/all diff --git a/t/autosubdir/test.do b/t/250-makedir/autosubdir/all.do similarity index 100% rename from t/autosubdir/test.do rename to t/250-makedir/autosubdir/all.do diff --git a/t/autosubdir/clean.do b/t/250-makedir/autosubdir/clean.do similarity index 100% rename from t/autosubdir/clean.do rename to t/250-makedir/autosubdir/clean.do diff --git a/t/autosubdir/default.txt.do b/t/250-makedir/autosubdir/default.txt.do similarity index 100% rename from t/autosubdir/default.txt.do rename to t/250-makedir/autosubdir/default.txt.do diff --git a/t/250-makedir/clean.do b/t/250-makedir/clean.do new file mode 100644 index 0000000..1c51d31 --- /dev/null +++ b/t/250-makedir/clean.do @@ -0,0 +1,4 @@ +redo dirtest/clean autosubdir/clean +rm -rf makedir +rm -f *~ .*~ makedir.log + diff --git a/t/deps/dirtest/.gitignore b/t/250-makedir/dirtest/.gitignore similarity index 100% rename from t/deps/dirtest/.gitignore rename to t/250-makedir/dirtest/.gitignore diff --git a/t/deps/dirtest/test.do b/t/250-makedir/dirtest/all.do similarity index 100% rename from t/deps/dirtest/test.do rename to t/250-makedir/dirtest/all.do diff --git a/t/deps/dirtest/clean.do b/t/250-makedir/dirtest/clean.do similarity index 100% rename from t/deps/dirtest/clean.do rename to t/250-makedir/dirtest/clean.do diff --git a/t/deps/dirtest/dir1/go.do b/t/250-makedir/dirtest/dir1/go.do similarity index 100% rename from t/deps/dirtest/dir1/go.do rename to t/250-makedir/dirtest/dir1/go.do diff --git a/t/deps/dirtest/dir1/stinky.do b/t/250-makedir/dirtest/dir1/stinky.do similarity index 100% rename from t/deps/dirtest/dir1/stinky.do rename to t/250-makedir/dirtest/dir1/stinky.do diff --git a/t/deps/dirtest/t1.do b/t/250-makedir/dirtest/t1.do similarity index 100% rename from t/deps/dirtest/t1.do rename to t/250-makedir/dirtest/t1.do diff --git a/t/makedir.do b/t/250-makedir/makedir.do similarity index 100% rename from t/makedir.do rename to t/250-makedir/makedir.do diff --git a/t/makedir2.do b/t/250-makedir/makedir2.do similarity index 89% rename from t/makedir2.do rename to t/250-makedir/makedir2.do index 67ea32a..73c6b79 100644 --- a/t/makedir2.do +++ b/t/250-makedir/makedir2.do @@ -1,7 +1,7 @@ rm -f makedir.log redo makedir touch makedir/outfile -./flush-cache +../flush-cache redo-ifchange makedir COUNT=$(wc -l >stampy.log redo-ifchange inp bob cat inp cd .. -redo-stamp &2 + +# builds the rest +/bin/ls [2-9][0-9][0-9]*/all.do | +sed 's/\.do$//' | +xargs redo-ifchange diff --git a/t/clean.do b/t/clean.do index 8edb53b..d4e7617 100644 --- a/t/clean.do +++ b/t/clean.do @@ -1,8 +1,5 @@ -redo example/clean curse/clean deps/clean "space dir/clean" stamp/clean \ - defaults-flat/clean defaults-nested/clean autosubdir/clean \ - fail/clean -rm -f broken nonshelltest shellfile mode1 makedir.log chdir1 deltest2 \ - hello [by]ellow *.o *~ .*~ *.log CC LD passfail silence silence.do \ - touch1 touch1.do always1 ifcreate[12].dep ifcreate[12] *.vartest \ - atime2 -rm -rf makedir +/bin/ls [0-9][0-9][0-9]*/clean.do | +sed 's/\.do$//' | +xargs redo + +rm -f broken shellfile *~ .*~ diff --git a/t/ifcreate2.do b/t/ifcreate2.do deleted file mode 100644 index 3fcfe8a..0000000 --- a/t/ifcreate2.do +++ /dev/null @@ -1,7 +0,0 @@ -cd .. -if [ -e t/ifcreate2.dep ]; then - redo-ifchange t/ifcreate2.dep -else - redo-ifcreate t/ifcreate2.dep -fi -echo $$ >>t/ifcreate2.log diff --git a/t/test.do b/t/test.do deleted file mode 100644 index 8459931..0000000 --- a/t/test.do +++ /dev/null @@ -1,9 +0,0 @@ -redo-ifchange all -./hello >&2 -redo nonshelltest shelltest \ - deltest deltest2 test.args test2.args passfailtest chdirtest \ - curse/test deps/test "space dir/test" modetest makedir2 \ - silencetest touchtest stamp/test alwaystest ifcreate-test \ - unicode blank/blank vartest atime autosubdir/test \ - fail/test - diff --git a/test.do b/test.do index bab832a..7c5e319 100644 --- a/test.do +++ b/test.do @@ -1,3 +1,3 @@ redo-ifchange _all -redo t/test +redo t/all [ -n "$DO_BUILT" ] || echo "Don't forget to test 'minimal/do test'" >&2