Repurpose regcompare test as unoidl-check test

532b47a650ce5189e1fb759201129d7d1f434133 "[ABI CHANGE] In SDK, replace
regcompare with unoidl-check" had left "registry/CustomTarget_regcompare_test.mk
around to verify that unoidl-check behaves the same as did regcompare on those
old-format .urd/.rdb files."  Behavior of unoidl-check on those old-format .rdb
files will become less relevant with the planned move from the old-format
idlc/regmerge toolchain to the new-format unoidl-write toolchain also for the
SDK.  But there appear to be no unit tests for unoidl-check, so repurpose (and
move around) the existing test (switching it from using idlc/regmerge to using
unoidl-write).

Change-Id: I4c33e9c16aaf0f99e35d9257a40f3bc2ae2725ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121783
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

10 files changed, 0 insertions, 232 deletions

diff --git a/registry/CustomTarget_regcompare_test.mk b/registry/CustomTarget_regcompare_test.mk
deleted file mode 100644
index e7816301f8ce..000000000000
--- a/registry/CustomTarget_regcompare_test.mk
+++ /dev/null
@@ -1,213 +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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,registry/regcompare_test))
-
-.PHONY: $(call gb_CustomTarget_get_target,registry/regcompare_test)
-
-$(call gb_CustomTarget_get_target,registry/regcompare_test): \
-        $(call gb_Executable_get_runtime_dependencies,unoidl-check) \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb
-ifneq ($(gb_SUPPRESS_TESTS),)
-	@true
-else
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-	$(call gb_Helper_abbreviate_dirs,( \
-        ! $(call gb_Executable_get_command,unoidl-check) \
-            $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-            -- $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb) \
-        > $@.log 2>&1 || (cat $@.log && false))
-endif
-
-$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.rdb: \
-        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.urd \
-        $(call gb_Executable_get_runtime_dependencies,regmerge)
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,regmerge) $@ /UCR $<))
-
-$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/%.urd: \
-        $(SRCDIR)/registry/test/regcompare/%.idl \
-        $(call gb_Executable_get_runtime_dependencies,idlc)
-	$(call gb_Helper_abbreviate_dirs,( \
-        $(call gb_Executable_get_command,idlc) \
-            -O$(call gb_CustomTarget_get_workdir,registry/regcompare_test) \
-            -cid -we $<))
-
-# vim: set noet sw=4 ts=4:
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 90f7833673d8..58de136de877 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -20,15 +20,4 @@ $(eval $(call gb_Module_add_targets,registry,\
 	) \
 ))
 
-ifneq ($(OS),iOS) # missing regmerge (see above), needed within test
-
-ifeq ($(ENABLE_MACOSX_SANDBOX),) # ditto
-
-$(eval $(call gb_Module_add_check_targets,registry, \
-    CustomTarget_regcompare_test \
-))
-
-endif
-endif
-
 # vim:set noet sw=4 ts=4:
diff --git a/registry/test/regcompare/other1.idl b/registry/test/regcompare/other1.idl
deleted file mode 100644
index 75473015bc82..000000000000
--- a/registry/test/regcompare/other1.idl
+++ /dev/null
@@ -1 +0,0 @@
-module M { enum X { V }; };
diff --git a/registry/test/regcompare/other2.idl b/registry/test/regcompare/other2.idl
deleted file mode 100644
index f6c94ef66548..000000000000
--- a/registry/test/regcompare/other2.idl
+++ /dev/null
@@ -1 +0,0 @@
-enum X { V };
diff --git a/registry/test/regcompare/pe.idl b/registry/test/regcompare/pe.idl
deleted file mode 100644
index c597b29f048d..000000000000
--- a/registry/test/regcompare/pe.idl
+++ /dev/null
@@ -1 +0,0 @@
-module M { published enum N { V }; };
diff --git a/registry/test/regcompare/psa.idl b/registry/test/regcompare/psa.idl
deleted file mode 100644
index b8079c9add9d..000000000000
--- a/registry/test/regcompare/psa.idl
+++ /dev/null
@@ -1 +0,0 @@
-module M { published struct N { long m; }; };
diff --git a/registry/test/regcompare/psb.idl b/registry/test/regcompare/psb.idl
deleted file mode 100644
index 03d02b302c96..000000000000
--- a/registry/test/regcompare/psb.idl
+++ /dev/null
@@ -1 +0,0 @@
-module M { published struct N { short m; }; };
diff --git a/registry/test/regcompare/ue.idl b/registry/test/regcompare/ue.idl
deleted file mode 100644
index 0face3356b23..000000000000
--- a/registry/test/regcompare/ue.idl
+++ /dev/null
@@ -1 +0,0 @@
-module M { enum N { V }; };
diff --git a/registry/test/regcompare/usa.idl b/registry/test/regcompare/usa.idl
deleted file mode 100644
index 80fe2c2f4c2e..000000000000
--- a/registry/test/regcompare/usa.idl
+++ /dev/null
@@ -1 +0,0 @@
-module M { struct N { long m; }; };
diff --git a/registry/test/regcompare/usb.idl b/registry/test/regcompare/usb.idl
deleted file mode 100644
index 08e7e9daa9d4..000000000000
--- a/registry/test/regcompare/usb.idl
+++ /dev/null
@@ -1 +0,0 @@
-module M { struct N { short m; }; };