diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 23:31:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-29 00:58:44 +0100 |
| commit | a50682cd93589ad3242beae2ba14a655ab4c867f (patch) | |
| tree | cfee213f4fde869ced3fc5f4153b81fec07f7dcd /solenv | |
| parent | bc15aa35db29fba9a5e2a5434777573423cab429 (diff) | |
gbuild: remove gb_CppunitTestFakeExecutable_get_target
... use the real Executable instead
Change-Id: I46b8374e921b9165a6bb71fba6f6f3459dd18c67
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 15 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index e108fbc137c4..87c5cec9bdf9 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -301,20 +301,7 @@ $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(OUTDIR)/unittest/registry endef define gb_CppunitTest_use_executable -$(call gb_CppunitTest_get_target,$(1)) : \ - $(call gb_CppunitTestFakeExecutable_get_target,$(2)) - -$(call gb_CppunitTest_get_clean_target,$(1)) : \ - $(call gb_CppunitTestFakeExecutable_get_clean_target,$(2)) - -$(call gb_CppunitTestFakeExecutable_get_target,$(2)) : \ - $(call gb_Executable_get_target,$(2)) - $(call gb_Helper_abbreviate_dirs,mkdir -p $$(dir $$@) && cp $$< $$@) - -.PHONY : $(call gb_CppunitTestFakeExecutable_get_clean_target,$(2)) -$(call gb_CppunitTestFakeExecutable_get_clean_target,$(2)) : - $(call gb_Helper_abbreviate_dirs, \ - rm -f $(call gb_CppunitTestFakeExecutable_get_target,$(2))) +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index e8ee181860b0..704cf803ac0d 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -72,8 +72,6 @@ gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component gb_ComponentTarget_get_target_for_build = $(WORKDIR_FOR_BUILD)/ComponentTarget/$(1).component gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test -gb_CppunitTestFakeExecutable_get_target = \ - $(OUTDIR)/unittest/install/$(LIBO_BIN_FOLDER)/$(1) gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done |