summaryrefslogtreecommitdiff
path: root/testtools/CustomTarget_uno_test.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-06-05 16:04:20 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-05 16:14:55 +0200
commit160181bbf11586796a6deb50ad13d895f3a74727 (patch)
treec31c9b3269c82bd6a334ae939a5db9415807639e /testtools/CustomTarget_uno_test.mk
parent797c51759f332adb3241da0abc904b11a39eb6d4 (diff)
normalize gbuild variable names in testtools.
Variables should have module name as prefix to prevent collisions. Change-Id: I8937e1e04db422d629779ea470bfbd614aeb7524 (cherry picked from commit 71dbf5bfd0b9622ad485a5b7620e11d8405ed474)
Diffstat (limited to 'testtools/CustomTarget_uno_test.mk')
-rw-r--r--testtools/CustomTarget_uno_test.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 89a8d274c94d..3cbea087dfe4 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -25,15 +25,16 @@
# instead of those above.
$(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
-UNO_EXE := $(OUTDIR)/bin/uno
# this target is phony to run it every time
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
-$(call gb_CustomTarget_get_target,testtools/uno_test) : $(call gb_Rdb_get_target,uno_services) \
- $(UNO_EXE) \
- $(call gb_InternalUnoApi_get_target,bridgetest)
- $(call gb_Helper_abbreviate_dirs, $(UNO_EXE) \
+$(call gb_CustomTarget_get_target,testtools/uno_test) : \
+ $(call gb_Rdb_get_target,uno_services) \
+ $(call gb_Executable_get_target_for_build,uno) \
+ $(call gb_InternalUnoApi_get_target,bridgetest)
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Executable_get_target_for_build,uno) \
-ro $(OUTDIR)/xml/uno_services.rdb \
-ro $(OUTDIR)/bin/udkapi.rdb \
-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \