From 4c06332ea167096128cc35259dd8c9bb01155b1c Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Mon, 17 Jan 2011 23:53:35 -0800 Subject: [PATCH] builder.py: we weren't stamping .do files correctly if dodir!='.'. The result was that t/deps/dirtest was actually failing in some cases. But it wasn't failing quite reliably enough, because the failing test was dirtest/dir1/all, which has the same name as some other 'all' files, confusing the issue. Renamed dirtest/dir1/all.do to dirtest/dir1/go.do instead. Reported by Prakhar Goel and Berke Durak. --- builder.py | 2 +- t/deps/dirtest/dir1/{all.do => go.do} | 0 t/deps/dirtest/t1.do | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename t/deps/dirtest/dir1/{all.do => go.do} (100%) diff --git a/builder.py b/builder.py index 04691fd..faf99cc 100644 --- a/builder.py +++ b/builder.py @@ -154,7 +154,7 @@ class BuildJob: self.argv = argv sf.is_generated = True sf.save() - dof = state.File(name=dofile) + dof = state.File(name=os.path.join(dodir, dofile)) dof.set_static() dof.save() state.commit() diff --git a/t/deps/dirtest/dir1/all.do b/t/deps/dirtest/dir1/go.do similarity index 100% rename from t/deps/dirtest/dir1/all.do rename to t/deps/dirtest/dir1/go.do diff --git a/t/deps/dirtest/t1.do b/t/deps/dirtest/t1.do index 48e8643..9b617cb 100644 --- a/t/deps/dirtest/t1.do +++ b/t/deps/dirtest/t1.do @@ -1,2 +1,2 @@ -redo-ifchange dir1/all +redo-ifchange dir1/go echo $$ >>log