From e207b723b4cb30cbdf712de32b5a322d5b6f1d25 Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Sun, 19 Dec 2010 04:52:23 -0800 Subject: [PATCH] Move some of the tests from t/ into t/defaults-flat. This lets us move t/default.do out of the way; it was confusing otherwise. --- t/all.do | 2 +- t/clean.do | 5 +++-- t/defaults-flat/all.do | 1 + t/{ => defaults-flat}/c.c.c.b.b.a | 0 t/{ => defaults-flat}/c.do | 0 t/defaults-flat/clean.do | 2 ++ t/{ => defaults-flat}/default.b.do | 2 +- t/{ => defaults-flat}/default.c.c.do | 2 +- t/{ => defaults-flat}/default.c.do | 2 +- t/{ => defaults-flat}/default.do | 2 +- test.do | 2 +- 11 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 t/defaults-flat/all.do rename t/{ => defaults-flat}/c.c.c.b.b.a (100%) rename t/{ => defaults-flat}/c.do (100%) create mode 100644 t/defaults-flat/clean.do rename t/{ => defaults-flat}/default.b.do (92%) rename t/{ => defaults-flat}/default.c.c.do (77%) rename t/{ => defaults-flat}/default.c.do (77%) rename t/{ => defaults-flat}/default.do (75%) diff --git a/t/all.do b/t/all.do index 668323c..b15b1aa 100644 --- a/t/all.do +++ b/t/all.do @@ -1,2 +1,2 @@ -redo-ifchange hello yellow bellow c d example/all +redo-ifchange hello yellow bellow defaults-flat/all example/all diff --git a/t/clean.do b/t/clean.do index 4b76a1c..3062fb3 100644 --- a/t/clean.do +++ b/t/clean.do @@ -1,5 +1,6 @@ -redo example/clean curse/clean deps/clean "space dir/clean" stamp/clean -rm -f c c.c c.c.c c.c.c.b c.c.c.b.b d mode1 makedir.log chdir1 deltest2 \ +redo example/clean curse/clean deps/clean "space dir/clean" stamp/clean \ + defaults-flat/clean +rm -f 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] rm -rf makedir diff --git a/t/defaults-flat/all.do b/t/defaults-flat/all.do new file mode 100644 index 0000000..f5753c3 --- /dev/null +++ b/t/defaults-flat/all.do @@ -0,0 +1 @@ +redo-ifchange c d diff --git a/t/c.c.c.b.b.a b/t/defaults-flat/c.c.c.b.b.a similarity index 100% rename from t/c.c.c.b.b.a rename to t/defaults-flat/c.c.c.b.b.a diff --git a/t/c.do b/t/defaults-flat/c.do similarity index 100% rename from t/c.do rename to t/defaults-flat/c.do diff --git a/t/defaults-flat/clean.do b/t/defaults-flat/clean.do new file mode 100644 index 0000000..37c32b0 --- /dev/null +++ b/t/defaults-flat/clean.do @@ -0,0 +1,2 @@ +rm -f c c.c c.c.c c.c.c.b c.c.c.b.b d \ + *~ .*~ diff --git a/t/default.b.do b/t/defaults-flat/default.b.do similarity index 92% rename from t/default.b.do rename to t/defaults-flat/default.b.do index 3c533bb..fd14711 100644 --- a/t/default.b.do +++ b/t/defaults-flat/default.b.do @@ -7,4 +7,4 @@ else echo b-to-b cat "$1$2.b" fi -./sleep 1.1 +../sleep 1.1 diff --git a/t/default.c.c.do b/t/defaults-flat/default.c.c.do similarity index 77% rename from t/default.c.c.do rename to t/defaults-flat/default.c.c.do index c7d83c1..4b4d226 100644 --- a/t/default.c.c.do +++ b/t/defaults-flat/default.c.c.do @@ -1,4 +1,4 @@ redo-ifchange $1$2.b echo b-to-cc cat $1$2.b -./sleep 1.2 +../sleep 1.2 diff --git a/t/default.c.do b/t/defaults-flat/default.c.do similarity index 77% rename from t/default.c.do rename to t/defaults-flat/default.c.do index ad1e84b..275f12a 100644 --- a/t/default.c.do +++ b/t/defaults-flat/default.c.do @@ -1,4 +1,4 @@ redo-ifchange $1$2.c echo c-to-c cat $1$2.c -./sleep 1.3 +../sleep 1.3 diff --git a/t/default.do b/t/defaults-flat/default.do similarity index 75% rename from t/default.do rename to t/defaults-flat/default.do index b82ef97..44aecf7 100644 --- a/t/default.do +++ b/t/defaults-flat/default.do @@ -1,4 +1,4 @@ redo-ifchange c echo default-rule cat c -./sleep 1.4 +../sleep 1.4 diff --git a/test.do b/test.do index 184db88..4744d97 100644 --- a/test.do +++ b/test.do @@ -1,2 +1,2 @@ -redo-ifchange Documentation/all t/c.c +redo-ifchange Documentation/all redo t/test