Sat May 30 00:37:47 UTC 2020

jurt/JunitTest_remote.mk           |   37 -------------------------------------
 jurt/JunitTest_uno.mk              |   31 -------------------------------
 jurt/JunitTest_urp.mk              |   35 -----------------------------------
 jurt/JunitTest_util.mk             |   26 --------------------------
 jurt/Module_jurt.mk                |   13 -------------
 ridljar/CustomTarget_test_urp.mk   |   12 ++++++------
 ridljar/InternalUnoApi_test_urp.mk |    2 +-
 ridljar/JunitTest_bridgefactory.mk |   14 +++++++-------
 ridljar/JunitTest_connections.mk   |   14 +++++++-------
 ridljar/JunitTest_java.mk          |   14 +++++++-------
 ridljar/JunitTest_java_remote.mk   |   20 ++++++++++----------
 ridljar/JunitTest_remote.mk        |   37 +++++++++++++++++++++++++++++++++++++
 ridljar/JunitTest_uno.mk           |    7 +++++++
 ridljar/JunitTest_urp.mk           |   35 +++++++++++++++++++++++++++++++++++
 ridljar/JunitTest_util.mk          |    2 ++
 ridljar/Module_ridljar.mk          |    8 ++++++++
 16 files changed, 127 insertions(+), 180 deletions(-)

New commits:
commit f845b6c6682a46a83c13845373abf738aec0c428
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu Feb 6 08:40:43 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat May 30 02:37:14 2020 +0200

    Cleanup: Move unit tests to ridljar
    
    Follow-up cleanup for ae855bf48163ff64d94cfc34aff8e37abdb5518d
    
    Change-Id: Ibec2fe89d70d6001af7d75c5eb4081b5b2af30e6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88073
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit faa59a82cebd69ba4d5b665f00983b9d374ac15c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95047
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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 3af341eb15d3..000000000000
--- a/jurt/JunitTest_uno.mk
+++ /dev/null
@@ -1,31 +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_use_jar_classset,jurt_uno,jurt))
-
-$(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 164ea206ee4d..000000000000
--- a/jurt/JunitTest_util.mk
+++ /dev/null
@@ -1,26 +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_use_jar_classset,jurt_util,jurt))
-
-$(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
similarity index 59%
rename from jurt/CustomTarget_test_urp.mk
rename to 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
similarity index 77%
rename from jurt/InternalUnoApi_test_urp.mk
rename to 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
similarity index 53%
rename from jurt/JunitTest_bridgefactory.mk
rename to 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
similarity index 53%
rename from jurt/JunitTest_connections.mk
rename to 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
similarity index 54%
rename from jurt/JunitTest_java.mk
rename to 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
similarity index 50%
rename from jurt/JunitTest_java_remote.mk
rename to 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 e4497ebb1293..08966d70acfc 100644
--- a/ridljar/Module_ridljar.mk
+++ b/ridljar/Module_ridljar.mk
@@ -19,8 +19,16 @@ $(eval $(call gb_Module_add_targets,ridljar,\
 # unfortunately, these tests depend on qadevOOo, which depends on
 # ridl.jar for build...
 $(eval $(call gb_Module_add_subsequentcheck_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
similarity index 100%
rename from jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/comp/connections/PipedConnection_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/bridges/java_remote/BridgedObject_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/bridges/java_remote/ProxyFactory_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/environments/java/java_environment_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/environments/remote/JavaThreadPoolFactory_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/environments/remote/JobQueue_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/environments/remote/TestIWorkAt.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/environments/remote/TestReceiver.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/environments/remote/TestWorkAt.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/environments/remote/ThreadId_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/environments/remote/ThreadPool_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/protocols/urp/Cache_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/protocols/urp/Marshaling_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/protocols/urp/Protocol_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/protocols/urp/TestBridge.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/protocols/urp/TestObject.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/lib/util/NativeLibraryLoader_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/uno/AnyConverter_Test.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/uno/UnoRuntime_EnvironmentTest.java
rename to 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
similarity index 100%
rename from jurt/test/com/sun/star/uno/WeakReference_Test.java
rename to ridljar/test/com/sun/star/uno/WeakReference_Test.java
