summaryrefslogtreecommitdiffstats
path: root/solenv/gbuild/JunitTest.mk
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-11 14:30:09 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-11 14:30:09 +0100
commitbd2ec3392a707127ea0bf1a1b5d18ac408f8c09a (patch)
tree4ca147884a8beb13aa8451294cae88183575dd29 /solenv/gbuild/JunitTest.mk
parentMerge remote branch 'origin/feature/gnumake2.1' into integration/dev300_m101 (diff)
downloadcore-bd2ec3392a707127ea0bf1a1b5d18ac408f8c09a.tar.gz
core-bd2ec3392a707127ea0bf1a1b5d18ac408f8c09a.zip
Spaces -> tabs in gbuild, GNU make does not like spaces ;-)
Diffstat (limited to 'solenv/gbuild/JunitTest.mk')
-rw-r--r--solenv/gbuild/JunitTest.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index afc9486fd5a4..7334cdf4d5d4 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -32,16 +32,16 @@ gb_JunitTest_JAVACOMMAND := $(JAVAINTERPRETER) $(JAVAIFLAGS)
.PHONY : $(call gb_JunitTest_get_clean_target,%)
$(call gb_JunitTest_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(call gb_JunitTest_get_classsetname,%))
- $(call gb_Helper_abbreviate_dirs,\
- rm -f $@ $@.log)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $@ $@.log)
.PHONY : $(call gb_JunitTest_get_target,$(1))
$(call gb_JunitTest_get_target,%) :
- $(call gb_Output_announce,$*,$(true),JUT,2)
- $(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
- $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
- $(CLEAN_CMD)
+ $(call gb_Output_announce,$*,$(true),JUT,2)
+ $(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
+ $(gb_JunitTest_JAVACOMMAND) -cp "$(CLASSPATH)" $(DEFS) org.junit.runner.JUnitCore $(CLASSES) 2>&1 > $@.log || (cat $@.log && false))
+ $(CLEAN_CMD)
define gb_JunitTest_JunitTest
$(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$(gb_CLASSPATHSEP)$(OUTDIR)/lib
@@ -94,4 +94,4 @@ define gb_JunitTest_add_jars
$(foreach jar,$(2),$(call gb_JunitTest_add_jar,$(1),$(jar)))
endef
-# vim: set noet sw=4 ts=4:
+# vim: set noet sw=4: