summaryrefslogtreecommitdiff
path: root/jurt
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2003-04-23 16:05:08 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2003-04-23 16:05:08 +0000
commitcada8f0153382d53052df89bd01cfa510c59ed78 (patch)
tree236459c67da7e0ea5cba3c4f3e7db7d1f87d2e4e /jurt
parent861125b053370957beb4a61dedb2c76ff1a70a73 (diff)
INTEGRATION: CWS uno2 (1.4.56); FILE MERGED
2003/04/04 09:25:20 sb 1.4.56.1: #108628# Fixed tests.
Diffstat (limited to 'jurt')
-rw-r--r--jurt/test/makefile.mk38
1 files changed, 25 insertions, 13 deletions
diff --git a/jurt/test/makefile.mk b/jurt/test/makefile.mk
index b1773ff58866..c706420fce44 100644
--- a/jurt/test/makefile.mk
+++ b/jurt/test/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: hr $ $Date: 2003-03-26 12:33:05 $
+# last change: $Author: rt $ $Date: 2003-04-23 17:05:08 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -60,6 +60,18 @@
#
#*************************************************************************
+PRJ = ..
+PRJNAME = jurt
+
+.INCLUDE: settings.mk
+
+TEST_RECURSIVE_ARGS =
+.IF "$(debug)" != ""
+TEST_RECURSIVE_ARGS +:= debug=$(debug)
+.ENDIF
+.IF "$(product)" != ""
+TEST_RECURSIVE_ARGS +:= product=$(product)
+.ENDIF
test:
# cd ./com/sun/star/comp/bootstrap; make debug
@@ -69,14 +81,14 @@ test:
# cd ./com/sun/star/comp/rmserver/makefile.mk
# cd ./com/sun/star/comp/typedescriptionmanager/makefile.mk
# cd ./com/sun/star/comp/testcomp/makefile.mk
- cd ./com/sun/star/comp/connections; dmake debug=t product=full
- cd ./com/sun/star/lib/util; dmake debug=t product=full
- cd ./com/sun/star/uno; dmake debug=t product=full
- cd ./com/sun/star/lib/uno/environments/java; dmake debug=t product=full
- cd ./com/sun/star/lib/uno/bridges/java_remote; dmake debug=t product=full
- cd ./com/sun/star/lib/uno/environments/remote; dmake debug=t product=full
- cd ./com/sun/star/lib/uno/protocols; dmake debug=t product=full
- cd ./com/sun/star/comp/bridgefactory; dmake debug=t product=full
-#
- javac DoTests.java
- java -classpath $(CLASSPATH):. DoTests
+ cd ./com/sun/star/comp/connections; dmake $(TEST_RECURSIVE_ARGS)
+ cd ./com/sun/star/lib/util; dmake $(TEST_RECURSIVE_ARGS)
+ cd ./com/sun/star/uno; dmake $(TEST_RECURSIVE_ARGS)
+ cd ./com/sun/star/lib/uno/environments/java; dmake $(TEST_RECURSIVE_ARGS)
+ cd ./com/sun/star/lib/uno/bridges/java_remote; dmake $(TEST_RECURSIVE_ARGS)
+ cd ./com/sun/star/lib/uno/environments/remote; dmake $(TEST_RECURSIVE_ARGS)
+ cd ./com/sun/star/lib/uno/protocols; dmake $(TEST_RECURSIVE_ARGS)
+ cd ./com/sun/star/comp/bridgefactory; dmake $(TEST_RECURSIVE_ARGS)
+#
+ javac -classpath $(CLASSDIR) DoTests.java
+ java -classpath .:$(CLASSDIR):$(SOLARBINDIR)$/ridl.jar:$(SOLARBINDIR)$/sandbox.jar DoTests