From f7e4a8faa920a1d9746b056e9820da13b5b488e7 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Wed, 28 Apr 2021 10:34:16 +0800 Subject: [PATCH 01/11] [all] Fix resource leaks --- base/file_utils.cc | 4 +++- thin-provisioning/cache_stream.cc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/file_utils.cc b/base/file_utils.cc index e4f3722..8253660 100644 --- a/base/file_utils.cc +++ b/base/file_utils.cc @@ -155,8 +155,10 @@ file_utils::zero_superblock(std::string const &path) throw runtime_error("out of memory"); memset(buffer, 0, SUPERBLOCK_SIZE); - if (::write(fd.fd_, buffer, SUPERBLOCK_SIZE) != SUPERBLOCK_SIZE) + if (::write(fd.fd_, buffer, SUPERBLOCK_SIZE) != SUPERBLOCK_SIZE) { + free(buffer); throw runtime_error("couldn't zero superblock"); + } } //---------------------------------------------------------------- diff --git a/thin-provisioning/cache_stream.cc b/thin-provisioning/cache_stream.cc index 002b6ba..73b01b4 100644 --- a/thin-provisioning/cache_stream.cc +++ b/thin-provisioning/cache_stream.cc @@ -62,7 +62,7 @@ chunk const & cache_stream::get() { chunk_wrapper *w = new chunk_wrapper(*this); - return w->c_; + return w->c_; // wrapper will get freed by the put method } void From 0004dced935879e190dd660e1f82f1d751454c78 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Tue, 1 Jun 2021 11:24:11 +0800 Subject: [PATCH 02/11] [thin_show_metadata] Fix out-of-bounds access --- thin-provisioning/thin_show_metadata.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/thin-provisioning/thin_show_metadata.cc b/thin-provisioning/thin_show_metadata.cc index bdbab3f..dbc7a80 100644 --- a/thin-provisioning/thin_show_metadata.cc +++ b/thin-provisioning/thin_show_metadata.cc @@ -206,7 +206,8 @@ namespace { void run() { auto line_length = 80; - for (block_address b = 0; b < 2000; b++) { + block_address nr_blocks = std::min(2000, bm_.get_nr_blocks()); + for (block_address b = 0; b < nr_blocks; b++) { block_manager::read_ref rr = bm_.read_lock(b); if (!(b % line_length)) { From 041ed7858c887f2ae0c300741c61b8c8af7afe55 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Tue, 1 Jun 2021 13:32:26 +0800 Subject: [PATCH 03/11] [build] Fix customized emitter linkage --- contrib/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/Makefile.in b/contrib/Makefile.in index 038c41c..7192258 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -18,7 +18,7 @@ contrib/%.a: contrib/%.o $(V)echo " [AR] $@" $(V)$(AR) rcs $@ $^ -contrib/%.so: contrib/%.a +contrib/%.so: contrib/%.o $(V)echo " [LD] $@" $(V)$(CC) -shared -Wl,-soname,$@ -o $@ $< From 75c0a3656c700eabf13a4bbf09421871c77a5f43 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Tue, 1 Jun 2021 23:37:36 +0800 Subject: [PATCH 04/11] [thin_dump] Fix leaked shared object handle --- thin-provisioning/shared_library_emitter.cc | 113 +++++++++++++++++--- 1 file changed, 100 insertions(+), 13 deletions(-) diff --git a/thin-provisioning/shared_library_emitter.cc b/thin-provisioning/shared_library_emitter.cc index 58f12d2..2e845f3 100644 --- a/thin-provisioning/shared_library_emitter.cc +++ b/thin-provisioning/shared_library_emitter.cc @@ -8,22 +8,109 @@ using namespace thin_provisioning; //---------------------------------------------------------------- +struct shared_object { +public: + shared_object(const char *shared_lib) { + handle_ = dlopen(shared_lib, RTLD_LAZY); + if (!handle_) + throw runtime_error(dlerror()); + + dlerror(); // Clear any existing error + } + + virtual ~shared_object() { + dlclose(handle_); + } + + void *get_symbol(const char *symbol) { + void *sym = dlsym(handle_, symbol); + + char *error = dlerror(); + if (error) + throw runtime_error(error); + + return sym; + } + + void *handle_; +}; + +class shared_emitter : public emitter { +public: + shared_emitter(const char *shared_lib, ostream &out): sobj_(shared_lib) { + emitter::ptr (*create_fn)(ostream &out); + create_fn = reinterpret_cast( + sobj_.get_symbol("create_emitter")); + inner_ = create_fn(out); + } + + virtual ~shared_emitter() { + } + + void begin_superblock(std::string const &uuid, + uint64_t time, + uint64_t trans_id, + boost::optional flags, + boost::optional version, + uint32_t data_block_size, + uint64_t nr_data_blocks, + boost::optional metadata_snap) { + inner_->begin_superblock(uuid, + time, + trans_id, + flags, + version, + data_block_size, + nr_data_blocks, + metadata_snap); + } + + void end_superblock() { + inner_->end_superblock(); + } + + void begin_device(uint32_t dev_id, + uint64_t mapped_blocks, + uint64_t trans_id, + uint64_t creation_time, + uint64_t snap_time) { + inner_->begin_device(dev_id, mapped_blocks, trans_id, creation_time, snap_time); + } + + void end_device() { + inner_->end_device(); + } + + void begin_named_mapping(std::string const &name) { + inner_->begin_named_mapping(name); + } + + void end_named_mapping() { + inner_->end_named_mapping(); + } + + void identifier(std::string const &name) { + inner_->identifier(name); + } + + void range_map(uint64_t origin_begin, uint64_t data_begin, uint32_t time, uint64_t len) { + inner_->range_map(origin_begin, data_begin, time, len); + } + + void single_map(uint64_t origin_block, uint64_t data_block, uint32_t time) { + inner_->single_map(origin_block, data_block, time); + } + + shared_object sobj_; + emitter::ptr inner_; +}; + +//---------------------------------------------------------------- + emitter::ptr thin_provisioning::create_custom_emitter(string const &shared_lib, ostream &out) { - emitter::ptr (*create_fn)(ostream &out); - void *handle = dlopen(shared_lib.c_str(), RTLD_LAZY); - if (!handle) - throw runtime_error(dlerror()); - - dlerror(); // Clear any existing error - create_fn = reinterpret_cast(dlsym(handle, "create_emitter")); - - char *error = dlerror(); - if (error) - throw runtime_error(error); - - return create_fn(out); + return emitter::ptr(new shared_emitter(shared_lib.c_str(), out)); } //---------------------------------------------------------------- From 759407445f4e1c31cc0d7bff2881ebd981e2d8fe Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Wed, 2 Jun 2021 01:23:13 +0800 Subject: [PATCH 05/11] [thin_show_duplicates] Fix potential errors - Fix error if no --block-sector provided - Fix errors on pools without mappings, or zero-length file --- thin-provisioning/thin_show_duplicates.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/thin-provisioning/thin_show_duplicates.cc b/thin-provisioning/thin_show_duplicates.cc index b1eebb7..f7354eb 100644 --- a/thin-provisioning/thin_show_duplicates.cc +++ b/thin-provisioning/thin_show_duplicates.cc @@ -56,7 +56,7 @@ using namespace thin_provisioning; namespace { bool factor_of(block_address f, block_address n) { - return (n % f) == 0; + return f && (n % f) == 0; } uint64_t parse_int(string const &str, string const &desc) { @@ -132,11 +132,15 @@ namespace { class duplicate_detector { public: void scan_with_variable_sized_chunks(chunk_stream &stream) { + if (!stream.size()) + return; variable_chunk_stream vstream(stream, 4096); scan(vstream); } void scan_with_fixed_sized_chunks(chunk_stream &stream, block_address chunk_size) { + if (!stream.size()) + return; fixed_chunk_stream fstream(stream, chunk_size); scan(fstream); } @@ -222,7 +226,7 @@ namespace { if (fs.content_based_chunks) detector.scan_with_variable_sized_chunks(pstream); else { - if (*fs.block_size) { + if (!!fs.block_size) { if (factor_of(*fs.block_size, block_size)) block_size = *fs.block_size; else From 3145a1f4ded700cfda3f2dffc203cc5c3cfb1d13 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Wed, 2 Jun 2021 11:39:01 +0800 Subject: [PATCH 06/11] [thin_metadata_size] Fix potential string overflow --- thin-provisioning/thin_metadata_size.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/thin-provisioning/thin_metadata_size.cc b/thin-provisioning/thin_metadata_size.cc index b6a5718..f14696c 100644 --- a/thin-provisioning/thin_metadata_size.cc +++ b/thin-provisioning/thin_metadata_size.cc @@ -192,9 +192,13 @@ static void printf_aligned(struct global *g, char const *a, char const *b, char { char buf[80]; - strcpy(buf, b); - if (units) - strcat(buf, mandatory ? "{" :"["), strcat(buf, g->unit.chars), strcat(buf, mandatory ? "}" : "]"); + if (units) { + char left_bracket = mandatory ? '{' : '['; + char right_bracket = mandatory ? '}' : ']'; + snprintf(buf, 80, "%s%c%s%c", b, left_bracket, g->unit.chars, right_bracket); + } else { + snprintf(buf, 80, "%s", b); + } printf("\t%-4s%-44s%s\n", a, buf, c); } From 2e62363446389f6d160a0a10d7ab3e735401bb6c Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Wed, 2 Jun 2021 12:14:34 +0800 Subject: [PATCH 07/11] [all] Fix uninitialized class members --- era/restore_emitter.cc | 1 + thin-provisioning/metadata_dumper.cc | 10 +++++++--- thin-provisioning/thin_delta.cc | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/era/restore_emitter.cc b/era/restore_emitter.cc index c09fa66..7fbac7d 100644 --- a/era/restore_emitter.cc +++ b/era/restore_emitter.cc @@ -14,6 +14,7 @@ namespace { : md_(md), in_superblock_(false), in_writeset_(false), + era_(0), in_era_array_(false) { } diff --git a/thin-provisioning/metadata_dumper.cc b/thin-provisioning/metadata_dumper.cc index 4feb40f..665c762 100644 --- a/thin-provisioning/metadata_dumper.cc +++ b/thin-provisioning/metadata_dumper.cc @@ -180,7 +180,7 @@ namespace { // This is about classifying and summarising btree nodes. The use of a btree // node may not be obvious when inspecting it in isolation. But more information // may be gleaned by examining child and sibling nodes. -// +// // So the process is: // - scan every metadata block, summarising it's potential uses. // - repeatedly iterate those summaries until we can glean no more useful information. @@ -474,7 +474,7 @@ namespace { node_info get_internal_info(block_manager::read_ref &rr) { node_info info; info.b = rr.get_location(); - + // values refer to blocks, so we should have infos for them. auto n = to_node(rr); ::uint64_t key_low = 0; @@ -524,7 +524,7 @@ namespace { node_info info; info.b = rr.get_location(); - auto vsize = to_cpu(hdr.value_size); + auto vsize = to_cpu(hdr.value_size); info.values = to_cpu(hdr.nr_entries); if (vsize == sizeof(device_details_traits::disk_type)) { @@ -645,6 +645,10 @@ namespace { public: mapping_emit_visitor(emitter::ptr e) : e_(e), + origin_start_(0), + dest_start_(0), + time_(0), + len_(0), in_range_(false) { } diff --git a/thin-provisioning/thin_delta.cc b/thin-provisioning/thin_delta.cc index 0eb119e..56f97fa 100644 --- a/thin-provisioning/thin_delta.cc +++ b/thin-provisioning/thin_delta.cc @@ -214,7 +214,9 @@ namespace { class simple_emitter : public diff_emitter { public: simple_emitter(indented_stream &out) - : diff_emitter(out) { + : diff_emitter(out), + vbegin_(0), + vend_(0) { } void left_only(uint64_t vbegin, uint64_t dbegin, uint64_t len) { From 25ed2dfc9a4ef4b7ae19c8f58630b3a4e02e7d3d Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Wed, 2 Jun 2021 13:08:47 +0800 Subject: [PATCH 08/11] [thin_dump] Fix warnings on potential NULL pointer --- base/application.cc | 8 +++++++- base/application.h | 2 +- thin-provisioning/thin_dump.cc | 16 ++-------------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/base/application.cc b/base/application.cc index c0089c6..061ef59 100644 --- a/base/application.cc +++ b/base/application.cc @@ -25,8 +25,14 @@ command::die(string const &msg) } ::uint64_t -command::parse_uint64(string const &str, string const &desc) +command::parse_uint64(char const *str, char const *desc) { + if (!str) { + ostringstream out; + out << "Couldn't parse " << desc << ": NULL"; + die(out.str()); + } + try { // FIXME: check trailing garbage is handled return lexical_cast<::uint64_t>(str); diff --git a/base/application.h b/base/application.h index b799eaf..f071533 100644 --- a/base/application.h +++ b/base/application.h @@ -19,7 +19,7 @@ namespace base { virtual ~command() {} void die(std::string const &msg); - uint64_t parse_uint64(std::string const &str, std::string const &desc); + uint64_t parse_uint64(char const *str, char const *desc); virtual void usage(std::ostream &out) const = 0; diff --git a/thin-provisioning/thin_dump.cc b/thin-provisioning/thin_dump.cc index 74cfa91..c0e73e6 100644 --- a/thin-provisioning/thin_dump.cc +++ b/thin-provisioning/thin_dump.cc @@ -143,7 +143,6 @@ thin_dump_cmd::run(int argc, char **argv) int c; char const *output = NULL; const char shortopts[] = "hm::o:f:rV"; - char *end_ptr; block_address metadata_snap = 0; ::uint64_t dev_id; struct flags flags; @@ -181,13 +180,7 @@ thin_dump_cmd::run(int argc, char **argv) flags.use_metadata_snap = true; if (optarg) { // FIXME: deprecate this option - metadata_snap = strtoull(optarg, &end_ptr, 10); - if (end_ptr == optarg) { - cerr << "couldn't parse " << endl; - usage(cerr); - return 1; - } - + metadata_snap = parse_uint64(optarg, "metadata-snap"); flags.snap_location = metadata_snap; } break; @@ -197,12 +190,7 @@ thin_dump_cmd::run(int argc, char **argv) break; case 1: - dev_id = strtoull(optarg, &end_ptr, 10); - if (end_ptr == optarg) { - cerr << "couldn't parse \n"; - usage(cerr); - return 1; - } + dev_id = parse_uint64(optarg, "dev-id"); flags.opts.select_dev(dev_id); break; From db52308d850d338b1168c2ad8e2d5d6f86d51f9f Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Wed, 2 Jun 2021 13:14:30 +0800 Subject: [PATCH 09/11] [build] Remove unused sources from the regular build --- Makefile.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 11dbf75..38879dd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,10 +84,7 @@ COMMON_SOURCE=\ persistent-data/space_map.cc \ persistent-data/transaction_manager.cc \ persistent-data/validators.cc \ - thin-provisioning/cache_stream.cc \ - thin-provisioning/chunk_stream.cc \ thin-provisioning/device_tree.cc \ - thin-provisioning/fixed_chunk_stream.cc \ thin-provisioning/human_readable_format.cc \ thin-provisioning/mapping_tree.cc \ thin-provisioning/metadata.cc \ @@ -95,7 +92,6 @@ COMMON_SOURCE=\ thin-provisioning/metadata_counter.cc \ thin-provisioning/metadata_dumper.cc \ thin-provisioning/override_emitter.cc \ - thin-provisioning/pool_stream.cc \ thin-provisioning/restore_emitter.cc \ thin-provisioning/rmap_visitor.cc \ thin-provisioning/superblock.cc \ @@ -137,8 +133,12 @@ DEVTOOLS_SOURCE=\ dbg-lib/sm_show_traits.cc \ era/devel_commands.cc \ era/era_debug.cc \ + thin-provisioning/cache_stream.cc \ + thin-provisioning/chunk_stream.cc \ thin-provisioning/damage_generator.cc \ thin-provisioning/devel_commands.cc \ + thin-provisioning/fixed_chunk_stream.cc \ + thin-provisioning/pool_stream.cc \ thin-provisioning/thin_debug.cc \ thin-provisioning/thin_generate_damage.cc \ thin-provisioning/thin_generate_mappings.cc \ @@ -383,4 +383,3 @@ test: functional-test unit-test endif -include $(DEPEND_FILES) - From 050eacf4cb4c3b60f82c7c0657649c10a6bacae8 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Wed, 2 Jun 2021 14:59:29 +0800 Subject: [PATCH 10/11] [all] Remove unreachable code --- block-cache/io_engine.cc | 3 --- caching/hint_array.cc | 6 ------ 2 files changed, 9 deletions(-) diff --git a/block-cache/io_engine.cc b/block-cache/io_engine.cc index 2fe4082..0158723 100644 --- a/block-cache/io_engine.cc +++ b/block-cache/io_engine.cc @@ -174,9 +174,6 @@ aio_engine::wait_(timespec *ts) cbs_.free(cb); return optional(make_pair(false, context)); } - - // shouldn't get here - return optional(make_pair(false, 0)); } struct timespec diff --git a/caching/hint_array.cc b/caching/hint_array.cc index 6514968..e133c5c 100644 --- a/caching/hint_array.cc +++ b/caching/hint_array.cc @@ -56,9 +56,6 @@ namespace { default: throw runtime_error("invalid hint width"); } - - // never get here - return std::shared_ptr(); } //-------------------------------- @@ -93,9 +90,6 @@ namespace { default: throw runtime_error("invalid hint width"); } - - // never get here - return std::shared_ptr(); } //-------------------------------- From 8014643b9e85eea148cf1706bad5d3a46d3bb1e7 Mon Sep 17 00:00:00 2001 From: Ming-Hung Tsai Date: Wed, 2 Jun 2021 18:03:50 +0800 Subject: [PATCH 11/11] [build] Allow running tests without the --enable-testing configuration - Make the test targets always available (test, unit-test, functional-test) - Cleanup include paths, and bring back the CPPFLAGS in commit 3e24cff that was overwritten by the merge ca8f6df (PR #60) - Introduce the dev-tools target for building testing/dbg tools individually - Leave the --enable-testing option for backward compatibility --- Makefile.in | 45 ++++++++++++++++++++---------------------- unit-tests/Makefile.in | 4 ++-- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Makefile.in b/Makefile.in index 38879dd..b29551d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,15 +20,18 @@ V=@ PROGRAMS=\ bin/pdata_tools - -ifeq ("@TESTING@", "yes") -PROGRAMS += bin/pdata_tools_dev +DEV_TOOLS=\ + bin/pdata_tools_dev TESTLIBS=\ lib/libft.so -endif -.PHONY: all -all: $(PROGRAMS) $(TESTLIBS) +.PHONY: all dev-tools +all: $(PROGRAMS) +dev-tools: $(DEV_TOOLS) + +ifeq ("@TESTING@", "yes") +all += $(TESTLIB) +endif include contrib/Makefile @@ -185,7 +188,8 @@ CXXFLAGS+=@CXXOPTIMISE_FLAG@ CXXFLAGS+=@CXXDEBUG_FLAG@ CXXFLAGS+=@CXX_STRERROR_FLAG@ CXXFLAGS+=@LFS_FLAGS@ -INCLUDES+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) -I$(TOP_DIR)/thin-provisioning +CPPFLAGS?=@CPPFLAGS@ +CPPFLAGS+=-I$(TOP_BUILDDIR) -I$(TOP_DIR) LIBS:=-laio -lexpat -lboost_iostreams -ldl DEV_LIBS:=-lncurses @@ -211,30 +215,21 @@ INSTALL_DIR = $(INSTALL) -m 755 -d INSTALL_PROGRAM = $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -p -m 644 -ifeq ("@TESTING@", "yes") -TEST_INCLUDES=\ - -I$(TOP_DIR) \ - -Igoogletest/googlemock/include \ - -Igoogletest/googletest/include -else -TEST_INCLUDES= -endif - .SUFFIXES: .d .txt .8 %.o: %.cc @echo " [CXX] $<" @mkdir -p $(dir $@) - $(V) $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $< - $(V) $(CXX) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(TEST_INCLUDES) $(CXXFLAGS) $< > $*.$$$$; \ + $(V) $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $< + $(V) $(CXX) -MM -MT $(subst .cc,.o,$<) $(CPPFLAGS) $(CXXFLAGS) $< > $*.$$$$; \ sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \ $(RM) $*.$$$$ %.o: %.c @echo " [CC] $<" @mkdir -p $(dir $@) - $(V) $(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $< - $(V) $(CC) -MM -MT $(subst .cc,.o,$<) $(INCLUDES) $(TEST_INCLUDES) $(CFLAGS) $< > $*.$$$$; \ + $(V) $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< + $(V) $(CC) -MM -MT $(subst .cc,.o,$<) $(CPPFLAGS) $(CFLAGS) $< > $*.$$$$; \ sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \ $(RM) $*.$$$$ @@ -275,7 +270,7 @@ clean: find . -name \*.o -delete find . -name \*.gmo -delete find . -name \*.d -delete - $(RM) $(PROGRAMS) lib/*.a lib/*.so + $(RM) $(PROGRAMS) $(DEV_TOOLS) lib/*.a lib/*.so distclean: clean $(RM) config.cache config.log config.status configure.h version.h Makefile unit-tests/Makefile @@ -360,7 +355,8 @@ install-rust-tools: man8/thin_metadata_pack.8 man8/thin_metadata_unpack.8 rust-t $(INSTALL_DATA) man8/thin_metadata_pack.8 $(MANPATH)/man8 $(INSTALL_DATA) man8/thin_metadata_unpack.8 $(MANPATH)/man8 -ifeq ("@TESTING@", "yes") +#---------------------------------------------------------------- + include unit-tests/Makefile LIBFT_SOURCE=\ @@ -376,10 +372,11 @@ lib/libft.so: $(LIBFT_OBJECTS) .PHONEY: functional-test unit-test -functional-test: $(PROGRAMS) $(TESTLIBS) +functional-test: $(PROGRAMS) $(DEV_TOOLS) $(TESTLIBS) cd functional-tests && ./run-tests run test: functional-test unit-test -endif + +#---------------------------------------------------------------- -include $(DEPEND_FILES) diff --git a/unit-tests/Makefile.in b/unit-tests/Makefile.in index a8f1c8c..336c6a7 100644 --- a/unit-tests/Makefile.in +++ b/unit-tests/Makefile.in @@ -81,9 +81,9 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOURCE)) %.gmo: %.cc @echo " [CXX] $<" @mkdir -p $(dir $@) - $(V) $(CXX) -c $(TEST_INCLUDES) $(CPPFLAGS) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) -o $@ $< + $(V) $(CXX) -c $(CPPFLAGS) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) -o $@ $< @echo " [DEP] $<" - $(V) $(CXX) -MM -MT $(subst .cc,.o,$<) $(TEST_INCLUDES) $(CPPFLAGS) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) $< > $*.$$$$; \ + $(V) $(CXX) -MM -MT $(subst .cc,.o,$<) $(CPPFLAGS) $(GMOCK_INCLUDES) $(CXXFLAGS) $(GMOCK_FLAGS) $< > $*.$$$$; \ sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \ $(RM) $*.$$$$