o Teach tests to install in $(libdir)/ocfs2-test/<subpath>

Original-revision: 15
biger410 · Aug 25, 2008 · e8b020a · e8b020a
1 parent 6109ca2
commit e8b020a
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 13 deletions.
diff --git a/Config.make.in b/Config.make.in
@@ -24,6 +24,9 @@ mandir = @mandir@
 
 pyexecdir = @pyexecdir@
 
+
+TESTDIR = $(libdir)/ocfs2-test
+
 top_builddir = .
 
 INSTALL = @INSTALL@

diff --git a/Test.make b/Test.make
@@ -11,11 +11,16 @@ UNINST_PROGRAMS = $(TESTS)
 
 INSTALL_RULES = install-tests
 
+TEST_PWD = `pwd`
+TOPDIR_PWD = `cd $(TOPDIR) && pwd`
+
 install-tests: $(TESTS)
 ifdef TESTS
-	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(libdir)/ocfs2-tests
+	TEST_LOC="$(TEST_PWD)" ; \
+	TEST_LOC="$${TEST_LOC#$(TOPDIR_PWD)/}" ; \
+	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(TESTDIR)/$$TEST_LOC; \
 	for prog in $(TESTS); do \
-	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(libdir)/ocfs2-tests/$$prog; \
+	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(TESTDIR)/$$TEST_LOC/$$prog ; \
 	done
 endif
 

diff --git a/configure.in b/configure.in
@@ -1,6 +1,6 @@
 AC_PREREQ(2.54)
 
-AC_INIT(tests)
+AC_INIT(programs)
 
 PACKAGE=ocfs2-test
 

diff --git a/programs/extend_and_write/Makefile b/programs/extend_and_write/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = extend_and_write verify
 
@@ -21,4 +20,5 @@ extend_and_write: $(EXTEND_AND_WRITE_OBJECTS)
 verify: $(VERIFY_OBJECTS)
 	$(LINK) 
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/extendo/Makefile b/programs/extendo/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = extendo
 
@@ -15,4 +14,5 @@ DIST_FILES = $(SOURCES)
 extendo: $(OBJECTS)
 	$(LINK) 
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/lock_grab/Makefile b/programs/lock_grab/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = lock_grab
 
@@ -15,4 +14,5 @@ DIST_FILES = $(SOURCES)
 lock_grab: $(OBJECTS)
 	$(LINK) $(O2DLM_LIBS)
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/logwriter/Makefile b/programs/logwriter/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = logwriter
 
@@ -15,4 +14,5 @@ DIST_FILES = $(SOURCES)
 logwriter: $(OBJECTS)
 	$(LINK) 
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/lvb_torture/Makefile b/programs/lvb_torture/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = lvb_torture
 
@@ -17,4 +16,5 @@ DIST_FILES = $(SOURCES)
 lvb_torture: $(OBJECTS)
 	$(LINK) $(O2DLM_LIBS)
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/mmap_test/Makefile b/programs/mmap_test/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = mmap_test
 
@@ -15,4 +14,5 @@ DIST_FILES = $(SOURCES)
 mmap_test: $(OBJECTS)
 	$(LINK) 
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/multi_node_mmap/Makefile b/programs/multi_node_mmap/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = dommap
 
@@ -15,4 +14,5 @@ DIST_FILES = $(SOURCES)
 dommap: $(OBJECTS)
 	$(LINK) 
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/ttest/Makefile b/programs/ttest/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = ttest
 
@@ -15,4 +14,5 @@ DIST_FILES = $(SOURCES)
 ttest: $(OBJECTS)
 	$(LINK) 
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/write_append_truncate/Makefile b/programs/write_append_truncate/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = write_append_truncate
 
@@ -17,4 +16,5 @@ DIST_FILES = $(SOURCES)
 write_append_truncate: $(OBJECTS)
 	$(LINK)
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make
diff --git a/programs/write_torture/Makefile b/programs/write_torture/Makefile
@@ -1,7 +1,6 @@
 TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
-include $(TOPDIR)/Test.make
 
 TESTS = write_torture
 
@@ -15,4 +14,5 @@ DIST_FILES = $(SOURCES)
 write_torture: $(OBJECTS)
 	$(LINK) 
 
+include $(TOPDIR)/Test.make
 include $(TOPDIR)/Postamble.make