From: Jonathan Nieder Date: Fri, 18 Feb 2011 02:33:55 GMT Subject: [PATCH 2/3] Move test-* into a test-programs/ subdirectory Message-ID: <20110218023355.GC23435@elie> In-Reply-To: <20110218022701.GA23435@elie> Move the source to test programs such as test-sha1 to a subdirectory where they will distract people working on git proper. The test programs themselves will still go to the top level when built, so experimenters do not have to hunt around for them. Signed-off-by: Jonathan Nieder --- Makefile | 15 +++++++++------ test-chmtime.c => test-programs/test-chmtime.c | 0 [ etc etc ] .../test-string-pool.c | 0 .../test-subprocess.c | 0 test-svn-fe.c => test-programs/test-svn-fe.c | 0 test-treap.c => test-programs/test-treap.c | 0 21 files changed, 9 insertions(+), 6 deletions(-) rename test-chmtime.c => test-programs/test-chmtime.c (100%) [...] rename test-treap.c => test-programs/test-treap.c (100%) diff --git a/Makefile b/Makefile index b812c1e..f458f65 100644 --- a/Makefile +++ b/Makefile @@ -1830,7 +1830,7 @@ git.o git.spec \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ : GIT-VERSION-FILE -TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS)) +TEST_OBJS := $(patsubst test-%$X,test-programs/test-%.o,$(TEST_PROGRAMS)) GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \ git.o ifndef NO_CURL @@ -1840,8 +1840,11 @@ XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \ xdiff/xmerge.o xdiff/xpatience.o VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \ vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o -VCSSVN_TEST_OBJS = test-obj-pool.o test-string-pool.o \ - test-line-buffer.o test-treap.o +VCSSVN_TEST_OBJS = +VCSSVN_TEST_OBJS += test-programs/test-obj-pool.o +VCSSVN_TEST_OBJS += test-programs/test-string-pool.o +VCSSVN_TEST_OBJS += test-programs/test-line-buffer.o +VCSSVN_TEST_OBJS += test-programs/test-treap.o OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS) dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d) @@ -1970,7 +1973,7 @@ $(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) \ vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \ vcs-svn/svndump.h -test-svn-fe.o: vcs-svn/svndump.h +test-programs/test-svn-fe.o: vcs-svn/svndump.h endif libgit/exec_cmd.s libgit/exec_cmd.o: EXTRA_CPPFLAGS = \ @@ -2142,7 +2145,7 @@ test-svn-fe$X: vcs-svn/lib.a .PRECIOUS: $(TEST_OBJS) -test-%$X: test-%.o $(GITLIBS) +test-%$X: test-programs/test-%.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS) check-sha1:: test-sha1$X @@ -2321,7 +2324,7 @@ clean: $(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \ libgit/*.o builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB) $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X - $(RM) $(TEST_PROGRAMS) + $(RM) test-programs/*.o $(TEST_PROGRAMS) $(RM) -r bin-wrappers $(RM) -r $(dep_dirs) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope* diff --git a/test-chmtime.c b/test-programs/test-chmtime.c similarity index 100% rename from test-chmtime.c rename to test-programs/test-chmtime.c diff --git a/test-ctype.c b/test-programs/test-ctype.c similarity index 100% rename from test-ctype.c rename to test-programs/test-ctype.c diff --git a/test-date.c b/test-programs/test-date.c similarity index 100% rename from test-date.c rename to test-programs/test-date.c diff --git a/test-delta.c b/test-programs/test-delta.c similarity index 100% rename from test-delta.c rename to test-programs/test-delta.c diff --git a/test-dump-cache-tree.c b/test-programs/test-dump-cache-tree.c similarity index 100% rename from test-dump-cache-tree.c rename to test-programs/test-dump-cache-tree.c diff --git a/test-genrandom.c b/test-programs/test-genrandom.c similarity index 100% rename from test-genrandom.c rename to test-programs/test-genrandom.c diff --git a/test-index-version.c b/test-programs/test-index-version.c similarity index 100% rename from test-index-version.c rename to test-programs/test-index-version.c diff --git a/test-line-buffer.c b/test-programs/test-line-buffer.c similarity index 100% rename from test-line-buffer.c rename to test-programs/test-line-buffer.c diff --git a/test-match-trees.c b/test-programs/test-match-trees.c similarity index 100% rename from test-match-trees.c rename to test-programs/test-match-trees.c diff --git a/test-mktemp.c b/test-programs/test-mktemp.c similarity index 100% rename from test-mktemp.c rename to test-programs/test-mktemp.c diff --git a/test-obj-pool.c b/test-programs/test-obj-pool.c similarity index 100% rename from test-obj-pool.c rename to test-programs/test-obj-pool.c diff --git a/test-parse-options.c b/test-programs/test-parse-options.c similarity index 100% rename from test-parse-options.c rename to test-programs/test-parse-options.c diff --git a/test-path-utils.c b/test-programs/test-path-utils.c similarity index 100% rename from test-path-utils.c rename to test-programs/test-path-utils.c diff --git a/test-run-command.c b/test-programs/test-run-command.c similarity index 100% rename from test-run-command.c rename to test-programs/test-run-command.c diff --git a/test-sha1.c b/test-programs/test-sha1.c similarity index 100% rename from test-sha1.c rename to test-programs/test-sha1.c diff --git a/test-sigchain.c b/test-programs/test-sigchain.c similarity index 100% rename from test-sigchain.c rename to test-programs/test-sigchain.c diff --git a/test-string-pool.c b/test-programs/test-string-pool.c similarity index 100% rename from test-string-pool.c rename to test-programs/test-string-pool.c diff --git a/test-subprocess.c b/test-programs/test-subprocess.c similarity index 100% rename from test-subprocess.c rename to test-programs/test-subprocess.c diff --git a/test-svn-fe.c b/test-programs/test-svn-fe.c similarity index 100% rename from test-svn-fe.c rename to test-programs/test-svn-fe.c diff --git a/test-treap.c b/test-programs/test-treap.c similarity index 100% rename from test-treap.c rename to test-programs/test-treap.c -- 1.7.4.1