emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58 from vapier/master

Browse Source 
fix up test targets
This commit is contained in:
Joe Thornber 2016-05-09 07:11:29 +01:00
commit 4cff752433
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.in
View File

@ -229,12 +229,13 @@ install: bin/pdata_tools
ifeq ("@TESTING@", "yes") ifeq ("@TESTING@", "yes")
include unit-tests/Makefile include unit-tests/Makefile
.PHONEY: features .PHONY: features test check
features: pdata_tools features: bin/pdata_tools
cucumber --no-color --format progress cucumber --no-color --format progress
test: features unit-test test: features unit-test
check: unit-test
endif endif
-include $(DEPEND_FILES) -include $(DEPEND_FILES)

2
unit-tests/Makefile.in
View File

@ -84,7 +84,7 @@ unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a
@echo " [LD] $<" @echo " [LD] $<"
$(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT) $(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT)
.PHONEY: unit-test .PHONY: unit-test
unit-test: unit-tests/unit_tests unit-test: unit-tests/unit_tests
unit-tests/unit_tests unit-tests/unit_tests