From c2ab11e034d0a29cf59afe46f525a5860790041f Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Wed, 31 Aug 2011 13:53:46 +0100 Subject: [PATCH] separate out a separate makefile for the tests --- Makefile | 41 +++-------------------------------------- unit-tests/Makefile.in | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 unit-tests/Makefile.in diff --git a/Makefile b/Makefile index 71fb92e..2269074 100644 --- a/Makefile +++ b/Makefile @@ -6,28 +6,16 @@ SOURCE=\ space_map_disk.cc \ transaction_manager.cc -TEST_SOURCE=\ - unit-tests/block_t.cc \ - unit-tests/btree_t.cc \ - unit-tests/endian_t.cc \ - unit-tests/space_map_t.cc \ - unit-tests/space_map_disk_t.cc \ - unit-tests/transaction_manager_t.cc \ - OBJECTS=$(subst .cc,.o,$(SOURCE)) -TEST_PROGRAMS=$(subst .cc,,$(TEST_SOURCE)) TOP_DIR:=$(PWD) #CPPFLAGS=-Wall -g -I$(TOP_DIR) CPPFLAGS=-Wall -std=c++0x -g -I$(TOP_DIR) LIBS=-lstdc++ -.PHONEY: unit-tests test-programs +.PHONEY: test-programs test-programs: $(TEST_PROGRAMS) -unit-test: $(TEST_PROGRAMS) - for p in $(TEST_PROGRAMS); do echo Running $$p; ./$$p; done - .SUFFIXES: .cc .o .d %.d: %.cc @@ -38,35 +26,12 @@ unit-test: $(TEST_PROGRAMS) .cc.o: g++ -c $(CPPFLAGS) $(INCLUDES) -o $@ $< -multisnap_display: $(OBJECTS) main.o - g++ $(CPPFLAGS) -o $@ $+ $(LIBS) - thin_dump: $(OBJECTS) thin_dump.o g++ $(CPPFLAGS) -o $@ $+ $(LIBS) thin_repair: $(OBJECTS) thin_repair.o g++ $(CPPFLAGS) -o $@ $+ $(LIBS) -unit-tests/block_t: unit-tests/block_t.o - g++ $(CPPFLAGS) -o $@ $+ $(LIBS) - -unit-tests/btree_t: unit-tests/btree_t.o $(OBJECTS) - g++ $(CPPFLAGS) -o $@ $+ $(LIBS) - -unit-tests/space_map_t: unit-tests/space_map_t.o $(OBJECTS) - g++ $(CPPFLAGS) -o $@ $+ $(LIBS) - -unit-tests/space_map_disk_t: unit-tests/space_map_disk_t.o $(OBJECTS) - g++ $(CPPFLAGS) -o $@ $+ $(LIBS) - -unit-tests/transaction_manager_t: unit-tests/transaction_manager_t.o $(OBJECTS) - g++ $(CPPFLAGS) -o $@ $+ $(LIBS) - -unit-tests/metadata_t: unit-tests/metadata_t.o $(OBJECTS) - g++ $(CPPFLAGS) -o $@ $+ $(LIBS) - -unit-tests/endian_t: unit-tests/endian_t.o $(OBJECTS) - g++ $(CPPFLAGS) -o $@ $+ $(LIBS) - +include unit-tests/Makefile.in include $(subst .cc,.d,$(SOURCE)) -include $(subst .cc,.d,$(TEST_SOURCE)) \ No newline at end of file +include $(subst .cc,.d,$(TEST_SOURCE)) diff --git a/unit-tests/Makefile.in b/unit-tests/Makefile.in new file mode 100644 index 0000000..5ca5fd9 --- /dev/null +++ b/unit-tests/Makefile.in @@ -0,0 +1,35 @@ +TEST_SOURCE=\ + unit-tests/block_t.cc \ + unit-tests/btree_t.cc \ + unit-tests/endian_t.cc \ + unit-tests/space_map_t.cc \ + unit-tests/space_map_disk_t.cc \ + unit-tests/transaction_manager_t.cc + +TEST_PROGRAMS=$(subst .cc,,$(TEST_SOURCE)) + +.PHONEY: unit-test + +unit-test: $(TEST_PROGRAMS) + for p in $(TEST_PROGRAMS); do echo Running $$p; ./$$p; done + +unit-tests/block_t: unit-tests/block_t.o + g++ $(CPPFLAGS) -o $@ $+ $(LIBS) + +unit-tests/btree_t: unit-tests/btree_t.o $(OBJECTS) + g++ $(CPPFLAGS) -o $@ $+ $(LIBS) + +unit-tests/space_map_t: unit-tests/space_map_t.o $(OBJECTS) + g++ $(CPPFLAGS) -o $@ $+ $(LIBS) + +unit-tests/space_map_disk_t: unit-tests/space_map_disk_t.o $(OBJECTS) + g++ $(CPPFLAGS) -o $@ $+ $(LIBS) + +unit-tests/transaction_manager_t: unit-tests/transaction_manager_t.o $(OBJECTS) + g++ $(CPPFLAGS) -o $@ $+ $(LIBS) + +unit-tests/metadata_t: unit-tests/metadata_t.o $(OBJECTS) + g++ $(CPPFLAGS) -o $@ $+ $(LIBS) + +unit-tests/endian_t: unit-tests/endian_t.o $(OBJECTS) + g++ $(CPPFLAGS) -o $@ $+ $(LIBS)