diff options
| -rw-r--r-- | jurt/JunitTest_remote.mk | 37 | ||||
| -rw-r--r-- | jurt/JunitTest_uno.mk | 29 | ||||
| -rw-r--r-- | jurt/JunitTest_urp.mk | 35 | ||||
| -rw-r--r-- | jurt/JunitTest_util.mk | 24 | ||||
| -rw-r--r-- | jurt/Module_jurt.mk | 13 | ||||
| -rw-r--r-- | ridljar/CustomTarget_test_urp.mk (renamed from jurt/CustomTarget_test_urp.mk) | 12 | ||||
| -rw-r--r-- | ridljar/InternalUnoApi_test_urp.mk (renamed from jurt/InternalUnoApi_test_urp.mk) | 2 | ||||
| -rw-r--r-- | ridljar/JunitTest_bridgefactory.mk (renamed from jurt/JunitTest_bridgefactory.mk) | 14 | ||||
| -rw-r--r-- | ridljar/JunitTest_connections.mk (renamed from jurt/JunitTest_connections.mk) | 14 | ||||
| -rw-r--r-- | ridljar/JunitTest_java.mk (renamed from jurt/JunitTest_java.mk) | 14 | ||||
| -rw-r--r-- | ridljar/JunitTest_java_remote.mk (renamed from jurt/JunitTest_java_remote.mk) | 20 | ||||
| -rw-r--r-- | ridljar/JunitTest_remote.mk | 37 | ||||
| -rw-r--r-- | ridljar/JunitTest_uno.mk | 7 | ||||
| -rw-r--r-- | ridljar/JunitTest_urp.mk | 35 | ||||
| -rw-r--r-- | ridljar/JunitTest_util.mk | 2 | ||||
| -rw-r--r-- | ridljar/Module_ridljar.mk | 8 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java (renamed from jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/comp/connections/PipedConnection_Test.java (renamed from jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java (renamed from jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java (renamed from jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java (renamed from jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java (renamed from jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java (renamed from jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java (renamed from jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java (renamed from jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java (renamed from jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java (renamed from jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java (renamed from jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java (renamed from jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java (renamed from jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java (renamed from jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java (renamed from jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java (renamed from jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/protocols/urp/TestObject.java (renamed from jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl (renamed from jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java (renamed from jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/uno/AnyConverter_Test.java (renamed from jurt/test/com/sun/star/uno/AnyConverter_Test.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java (renamed from jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java) | 0 | ||||
| -rw-r--r-- | ridljar/test/com/sun/star/uno/WeakReference_Test.java (renamed from jurt/test/com/sun/star/uno/WeakReference_Test.java) | 0 |
39 files changed, 127 insertions, 176 deletions
diff --git a/jurt/JunitTest_remote.mk b/jurt/JunitTest_remote.mk deleted file mode 100644 index 1333076a1cbc..000000000000 --- a/jurt/JunitTest_remote.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_JunitTest_JunitTest,jurt_remote)) - -$(eval $(call gb_Jar_use_customtargets,jurt_remote, \ - ridljar/javamaker \ -)) - -$(eval $(call gb_JunitTest_use_jar_classset,jurt_remote,ridl)) - -$(eval $(call gb_JunitTest_add_classpath,jurt_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) - -$(eval $(call gb_JunitTest_add_sourcefiles,jurt_remote,\ - jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test \ - jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test \ - jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt \ - jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver \ - jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt \ - jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test \ - jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test \ -)) - -$(eval $(call gb_JunitTest_add_classes,jurt_remote,\ - com.sun.star.lib.uno.environments.remote.JavaThreadPoolFactory_Test \ - com.sun.star.lib.uno.environments.remote.JobQueue_Test \ - com.sun.star.lib.uno.environments.remote.ThreadId_Test \ - com.sun.star.lib.uno.environments.remote.ThreadPool_Test \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/jurt/JunitTest_uno.mk b/jurt/JunitTest_uno.mk deleted file mode 100644 index 1edfbf70174a..000000000000 --- a/jurt/JunitTest_uno.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_JunitTest_JunitTest,jurt_uno)) - -$(eval $(call gb_JunitTest_use_jars,jurt_uno,\ - OOoRunner \ - ridl \ -)) - -$(eval $(call gb_JunitTest_add_sourcefiles,jurt_uno,\ - jurt/test/com/sun/star/uno/AnyConverter_Test \ - jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest \ - jurt/test/com/sun/star/uno/WeakReference_Test \ -)) - -$(eval $(call gb_JunitTest_add_classes,jurt_uno,\ - com.sun.star.uno.AnyConverter_Test \ - com.sun.star.uno.UnoRuntime_EnvironmentTest \ - com.sun.star.uno.WeakReference_Test \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk deleted file mode 100644 index fff2bc54230c..000000000000 --- a/jurt/JunitTest_urp.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_JunitTest_JunitTest,jurt_urp)) - -$(eval $(call gb_JunitTest_use_customtargets,jurt_urp,\ - jurt/test/com/sun/star/lib/uno/protocols/urp \ - ridljar/javamaker \ -)) - -$(eval $(call gb_JunitTest_use_jar_classset,jurt_urp,ridl)) - -$(eval $(call gb_JunitTest_add_classpath,jurt_urp,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) - -$(eval $(call gb_JunitTest_add_sourcefiles,jurt_urp,\ - jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test \ - jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test \ - jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test \ - jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge \ - jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject \ -)) - -$(eval $(call gb_JunitTest_add_classes,jurt_urp,\ - com.sun.star.lib.uno.protocols.urp.Cache_Test \ - com.sun.star.lib.uno.protocols.urp.Marshaling_Test \ - com.sun.star.lib.uno.protocols.urp.Protocol_Test \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/jurt/JunitTest_util.mk b/jurt/JunitTest_util.mk deleted file mode 100644 index 72f1d29c10f2..000000000000 --- a/jurt/JunitTest_util.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_JunitTest_JunitTest,jurt_util)) - -$(eval $(call gb_JunitTest_use_jars,jurt_util,\ - ridl \ -)) - -$(eval $(call gb_JunitTest_add_sourcefiles,jurt_util,\ - jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test \ -)) - -$(eval $(call gb_JunitTest_add_classes,jurt_util,\ - com.sun.star.lib.util.NativeLibraryLoader_Test \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk index 89fb3973c687..1c0d5baa9483 100644 --- a/jurt/Module_jurt.mk +++ b/jurt/Module_jurt.mk @@ -22,19 +22,6 @@ $(eval $(call gb_Module_add_targets,jurt,\ )) endif -$(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\ - CustomTarget_test_urp \ - InternalUnoApi_test_urp \ - JunitTest_bridgefactory \ - JunitTest_connections \ - JunitTest_java \ - JunitTest_java_remote \ - JunitTest_remote \ - JunitTest_uno \ - JunitTest_urp \ - JunitTest_util \ -)) - endif # vim:set noet sw=4 ts=4: diff --git a/jurt/CustomTarget_test_urp.mk b/ridljar/CustomTarget_test_urp.mk index ce2fa371e89c..9ef7ac489e57 100644 --- a/jurt/CustomTarget_test_urp.mk +++ b/ridljar/CustomTarget_test_urp.mk @@ -7,19 +7,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp)) +$(eval $(call gb_CustomTarget_CustomTarget,ridljar/test/com/sun/star/lib/uno/protocols/urp)) -jurt_TESTURP := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp) +ridljar_TESTURP := $(call gb_CustomTarget_get_workdir,ridljar/test/com/sun/star/lib/uno/protocols/urp) -$(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp) : $(jurt_TESTURP)/done +$(call gb_CustomTarget_get_target,ridljar/test/com/sun/star/lib/uno/protocols/urp) : $(ridljar_TESTURP)/done -$(jurt_TESTURP)/done : \ +$(ridljar_TESTURP)/done : \ $(call gb_UnoApiTarget_get_target,test_urp) \ $(call gb_UnoApi_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) - rm -rf $(jurt_TESTURP) && \ - $(call gb_Helper_execute,javamaker -O$(jurt_TESTURP) -nD $< \ + rm -rf $(ridljar_TESTURP) && \ + $(call gb_Helper_execute,javamaker -O$(ridljar_TESTURP) -nD $< \ -X$(call gb_UnoApi_get_target,udkapi)) && \ touch $@ diff --git a/jurt/InternalUnoApi_test_urp.mk b/ridljar/InternalUnoApi_test_urp.mk index 637ce1b606e3..0fb6cf7c46fb 100644 --- a/jurt/InternalUnoApi_test_urp.mk +++ b/ridljar/InternalUnoApi_test_urp.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_InternalUnoApi_InternalUnoApi,test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl)) +$(eval $(call gb_InternalUnoApi_InternalUnoApi,test_urp,ridljar/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl)) $(eval $(call gb_InternalUnoApi_use_api,test_urp,\ udkapi \ diff --git a/jurt/JunitTest_bridgefactory.mk b/ridljar/JunitTest_bridgefactory.mk index 67ad789bb26e..bbf846152c44 100644 --- a/jurt/JunitTest_bridgefactory.mk +++ b/ridljar/JunitTest_bridgefactory.mk @@ -7,21 +7,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_JunitTest_JunitTest,jurt_bridgefactory)) +$(eval $(call gb_JunitTest_JunitTest,ridl_bridgefactory)) -$(eval $(call gb_Jar_use_customtargets,jurt_bridgefactory, \ +$(eval $(call gb_Jar_use_customtargets,ridl_bridgefactory, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,jurt_bridgefactory,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_bridgefactory,ridl)) -$(eval $(call gb_JunitTest_add_classpath,jurt_bridgefactory,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) +$(eval $(call gb_JunitTest_add_classpath,ridl_bridgefactory,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) -$(eval $(call gb_JunitTest_add_sourcefiles,jurt_bridgefactory,\ - jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test \ +$(eval $(call gb_JunitTest_add_sourcefiles,ridl_bridgefactory,\ + ridljar/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test \ )) -$(eval $(call gb_JunitTest_add_classes,jurt_bridgefactory,\ +$(eval $(call gb_JunitTest_add_classes,ridl_bridgefactory,\ com.sun.star.comp.bridgefactory.BridgeFactory_Test \ )) diff --git a/jurt/JunitTest_connections.mk b/ridljar/JunitTest_connections.mk index b5528121fab4..54cfc27e000c 100644 --- a/jurt/JunitTest_connections.mk +++ b/ridljar/JunitTest_connections.mk @@ -7,21 +7,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_JunitTest_JunitTest,jurt_connections)) +$(eval $(call gb_JunitTest_JunitTest,ridl_connections)) -$(eval $(call gb_Jar_use_customtargets,jurt_connections, \ +$(eval $(call gb_Jar_use_customtargets,ridl_connections, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,jurt_connections,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_connections,ridl)) -$(eval $(call gb_JunitTest_add_classpath,jurt_connections,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) +$(eval $(call gb_JunitTest_add_classpath,ridl_connections,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) -$(eval $(call gb_JunitTest_add_sourcefiles,jurt_connections,\ - jurt/test/com/sun/star/comp/connections/PipedConnection_Test \ +$(eval $(call gb_JunitTest_add_sourcefiles,ridl_connections,\ + ridljar/test/com/sun/star/comp/connections/PipedConnection_Test \ )) -$(eval $(call gb_JunitTest_add_classes,jurt_connections,\ +$(eval $(call gb_JunitTest_add_classes,ridl_connections,\ com.sun.star.comp.connections.PipedConnection_Test \ )) diff --git a/jurt/JunitTest_java.mk b/ridljar/JunitTest_java.mk index 715bc1b5fdab..e1a53dba8a3a 100644 --- a/jurt/JunitTest_java.mk +++ b/ridljar/JunitTest_java.mk @@ -7,21 +7,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_JunitTest_JunitTest,jurt_java)) +$(eval $(call gb_JunitTest_JunitTest,ridl_java)) -$(eval $(call gb_Jar_use_customtargets,jurt_java, \ +$(eval $(call gb_Jar_use_customtargets,ridl_java, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,jurt_java,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_java,ridl)) -$(eval $(call gb_JunitTest_add_classpath,jurt_java,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) +$(eval $(call gb_JunitTest_add_classpath,ridl_java,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) -$(eval $(call gb_JunitTest_add_sourcefiles,jurt_java,\ - jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test \ +$(eval $(call gb_JunitTest_add_sourcefiles,ridl_java,\ + ridljar/test/com/sun/star/lib/uno/environments/java/java_environment_Test \ )) -$(eval $(call gb_JunitTest_add_classes,jurt_java,\ +$(eval $(call gb_JunitTest_add_classes,ridl_java,\ com.sun.star.lib.uno.environments.java.java_environment_Test \ )) diff --git a/jurt/JunitTest_java_remote.mk b/ridljar/JunitTest_java_remote.mk index d96a6306fa88..38482d2b1e50 100644 --- a/jurt/JunitTest_java_remote.mk +++ b/ridljar/JunitTest_java_remote.mk @@ -7,27 +7,27 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_JunitTest_JunitTest,jurt_java_remote)) +$(eval $(call gb_JunitTest_JunitTest,ridl_java_remote)) -$(eval $(call gb_JunitTest_use_jars,jurt_java_remote,\ +$(eval $(call gb_JunitTest_use_jars,ridl_java_remote,\ OOoRunner \ )) -$(eval $(call gb_Jar_use_customtargets,jurt_java_remote, \ +$(eval $(call gb_Jar_use_customtargets,ridl_java_remote, \ ridljar/javamaker \ )) -$(eval $(call gb_JunitTest_use_jar_classset,jurt_java_remote,ridl)) +$(eval $(call gb_JunitTest_use_jar_classset,ridl_java_remote,ridl)) -$(eval $(call gb_JunitTest_add_classpath,jurt_java_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) +$(eval $(call gb_JunitTest_add_classpath,ridl_java_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) -$(eval $(call gb_JunitTest_add_sourcefiles,jurt_java_remote,\ - jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test \ - jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test \ - jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test \ +$(eval $(call gb_JunitTest_add_sourcefiles,ridl_java_remote,\ + ridljar/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test \ + ridljar/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test \ + ridljar/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test \ )) -$(eval $(call gb_JunitTest_add_classes,jurt_java_remote,\ +$(eval $(call gb_JunitTest_add_classes,ridl_java_remote,\ com.sun.star.lib.uno.bridges.java_remote.BridgedObject_Test \ com.sun.star.lib.uno.bridges.java_remote.ProxyFactory_Test \ com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge_Test \ diff --git a/ridljar/JunitTest_remote.mk b/ridljar/JunitTest_remote.mk new file mode 100644 index 000000000000..a0c94d5caa92 --- /dev/null +++ b/ridljar/JunitTest_remote.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_JunitTest_JunitTest,ridl_remote)) + +$(eval $(call gb_Jar_use_customtargets,ridl_remote, \ + ridljar/javamaker \ +)) + +$(eval $(call gb_JunitTest_use_jar_classset,ridl_remote,ridl)) + +$(eval $(call gb_JunitTest_add_classpath,ridl_remote,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) + +$(eval $(call gb_JunitTest_add_sourcefiles,ridl_remote,\ + ridljar/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test \ + ridljar/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test \ + ridljar/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt \ + ridljar/test/com/sun/star/lib/uno/environments/remote/TestReceiver \ + ridljar/test/com/sun/star/lib/uno/environments/remote/TestWorkAt \ + ridljar/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test \ + ridljar/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test \ +)) + +$(eval $(call gb_JunitTest_add_classes,ridl_remote,\ + com.sun.star.lib.uno.environments.remote.JavaThreadPoolFactory_Test \ + com.sun.star.lib.uno.environments.remote.JobQueue_Test \ + com.sun.star.lib.uno.environments.remote.ThreadId_Test \ + com.sun.star.lib.uno.environments.remote.ThreadPool_Test \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk index 7529582f94b7..e0a7ff4574a4 100644 --- a/ridljar/JunitTest_uno.mk +++ b/ridljar/JunitTest_uno.mk @@ -10,19 +10,26 @@ $(eval $(call gb_JunitTest_JunitTest,ridljar_uno)) $(eval $(call gb_JunitTest_use_jars,ridljar_uno,\ + OOoRunner \ ridl \ )) $(eval $(call gb_JunitTest_add_sourcefiles,ridljar_uno,\ + ridljar/test/com/sun/star/uno/AnyConverter_Test \ ridljar/test/com/sun/star/uno/Any_Test \ ridljar/test/com/sun/star/uno/Type_Test \ + ridljar/test/com/sun/star/uno/UnoRuntime_EnvironmentTest \ ridljar/test/com/sun/star/uno/UnoRuntime_Test \ + ridljar/test/com/sun/star/uno/WeakReference_Test \ )) $(eval $(call gb_JunitTest_add_classes,ridljar_uno,\ + com.sun.star.uno.AnyConverter_Test \ com.sun.star.uno.Any_Test \ com.sun.star.uno.Type_Test \ + com.sun.star.uno.UnoRuntime_EnvironmentTest \ com.sun.star.uno.UnoRuntime_Test \ + com.sun.star.uno.WeakReference_Test \ )) # vim:set noet sw=4 ts=4: diff --git a/ridljar/JunitTest_urp.mk b/ridljar/JunitTest_urp.mk new file mode 100644 index 000000000000..760f81992060 --- /dev/null +++ b/ridljar/JunitTest_urp.mk @@ -0,0 +1,35 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_JunitTest_JunitTest,ridl_urp)) + +$(eval $(call gb_JunitTest_use_customtargets,ridl_urp,\ + ridljar/test/com/sun/star/lib/uno/protocols/urp \ + ridljar/javamaker \ +)) + +$(eval $(call gb_JunitTest_use_jar_classset,ridl_urp,ridl)) + +$(eval $(call gb_JunitTest_add_classpath,ridl_urp,$(call gb_CustomTarget_get_workdir,ridljar/javamaker))) + +$(eval $(call gb_JunitTest_add_sourcefiles,ridl_urp,\ + ridljar/test/com/sun/star/lib/uno/protocols/urp/Cache_Test \ + ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test \ + ridljar/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test \ + ridljar/test/com/sun/star/lib/uno/protocols/urp/TestBridge \ + ridljar/test/com/sun/star/lib/uno/protocols/urp/TestObject \ +)) + +$(eval $(call gb_JunitTest_add_classes,ridl_urp,\ + com.sun.star.lib.uno.protocols.urp.Cache_Test \ + com.sun.star.lib.uno.protocols.urp.Marshaling_Test \ + com.sun.star.lib.uno.protocols.urp.Protocol_Test \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk index 3286b384a5a1..2be75f61f2e9 100644 --- a/ridljar/JunitTest_util.mk +++ b/ridljar/JunitTest_util.mk @@ -15,10 +15,12 @@ $(eval $(call gb_JunitTest_use_jars,ridljar_util,\ )) $(eval $(call gb_JunitTest_add_sourcefiles,ridljar_util,\ + ridljar/test/com/sun/star/lib/util/NativeLibraryLoader_Test \ ridljar/test/com/sun/star/lib/util/WeakMap_Test \ )) $(eval $(call gb_JunitTest_add_classes,ridljar_util,\ + com.sun.star.lib.util.NativeLibraryLoader_Test \ com.sun.star.lib.util.WeakMap_Test \ )) diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk index 680395583d13..daa0f1835be7 100644 --- a/ridljar/Module_ridljar.mk +++ b/ridljar/Module_ridljar.mk @@ -17,8 +17,16 @@ $(eval $(call gb_Module_add_targets,ridljar,\ )) $(eval $(call gb_Module_add_check_targets,ridljar,\ + CustomTarget_test_urp \ + InternalUnoApi_test_urp \ + JunitTest_bridgefactory \ + JunitTest_connections \ + JunitTest_java \ + JunitTest_java_remote \ + JunitTest_remote \ JunitTest_typedesc \ JunitTest_uno \ + JunitTest_urp \ JunitTest_util \ )) endif diff --git a/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java b/ridljar/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java index 965653bf76df..965653bf76df 100644 --- a/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java +++ b/ridljar/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java diff --git a/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java b/ridljar/test/com/sun/star/comp/connections/PipedConnection_Test.java index 6cfef789d9ab..6cfef789d9ab 100644 --- a/jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java +++ b/ridljar/test/com/sun/star/comp/connections/PipedConnection_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java b/ridljar/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java index e7dc9c0e19c9..e7dc9c0e19c9 100644 --- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java b/ridljar/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java index 45fc02f89989..45fc02f89989 100644 --- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java b/ridljar/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java index 53e150527187..53e150527187 100644 --- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java b/ridljar/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java index 9381e2af437c..9381e2af437c 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java b/ridljar/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java index 2d2264f06060..2d2264f06060 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java b/ridljar/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java index a63c9c7ed6ba..a63c9c7ed6ba 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java b/ridljar/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java index 7bb71a80e970..7bb71a80e970 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java +++ b/ridljar/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java b/ridljar/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java index 6c8f36885752..6c8f36885752 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java +++ b/ridljar/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java b/ridljar/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java index 93297815cb9e..93297815cb9e 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java +++ b/ridljar/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java b/ridljar/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java index 8ee7f4a4c264..8ee7f4a4c264 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java b/ridljar/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java index 7da68db23f0e..7da68db23f0e 100644 --- a/jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java b/ridljar/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java index a7d93733d79c..a7d93733d79c 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java b/ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java index 5cf5f73e6554..5cf5f73e6554 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java b/ridljar/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java index cda58aad8f62..cda58aad8f62 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java +++ b/ridljar/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java b/ridljar/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java index acd1b3948de7..acd1b3948de7 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java +++ b/ridljar/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java b/ridljar/test/com/sun/star/lib/uno/protocols/urp/TestObject.java index f36710e1d232..f36710e1d232 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java +++ b/ridljar/test/com/sun/star/lib/uno/protocols/urp/TestObject.java diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl b/ridljar/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl index 4ea1c8ebc2f8..4ea1c8ebc2f8 100644 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl +++ b/ridljar/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl diff --git a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java b/ridljar/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java index e4101f2dd713..e4101f2dd713 100644 --- a/jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java +++ b/ridljar/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/ridljar/test/com/sun/star/uno/AnyConverter_Test.java index faa955a96582..faa955a96582 100644 --- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java +++ b/ridljar/test/com/sun/star/uno/AnyConverter_Test.java diff --git a/jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java b/ridljar/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java index b10adf12e650..b10adf12e650 100644 --- a/jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java +++ b/ridljar/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java diff --git a/jurt/test/com/sun/star/uno/WeakReference_Test.java b/ridljar/test/com/sun/star/uno/WeakReference_Test.java index 960c05dad477..960c05dad477 100644 --- a/jurt/test/com/sun/star/uno/WeakReference_Test.java +++ b/ridljar/test/com/sun/star/uno/WeakReference_Test.java |