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, 215 insertions, 0 deletions

diff --git a/unoidl/CustomTarget_unoidl-check_test.mk b/unoidl/CustomTarget_unoidl-check_test.mk
new file mode 100644
index 000000000000..52ef4d6c30bd
--- /dev/null
+++ b/unoidl/CustomTarget_unoidl-check_test.mk
@@ -0,0 +1,206 @@
+# -*- 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,unoidl/unoidl-check_test))
+
+.PHONY: $(call gb_CustomTarget_get_target,unoidl/unoidl-check_test)
+
+$(call gb_CustomTarget_get_target,unoidl/unoidl-check_test): \
+        $(call gb_Executable_get_runtime_dependencies,unoidl-check) \
+        $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other1.rdb \
+        $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other2.rdb \
+        $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/pe.rdb \
+        $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psa.rdb \
+        $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/psb.rdb \
+        $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/ue.rdb \
+        $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/usa.rdb \
+        $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/psa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_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,unoidl/unoidl-check_test)/usa.rdb \
+            -- $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/other2.rdb) \
+        > $@.log 2>&1 || (cat $@.log && false))
+endif
+
+$(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/%.rdb: \
+        $(SRCDIR)/unoidl/qa/unoidl-check/%.idl \
+        $(call gb_Executable_get_runtime_dependencies,unoidl-write) \
+        | $(call gb_CustomTarget_get_workdir,unoidl/unoidl-check_test)/.dir
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,unoidl-write) $< $@))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index 11209c2d21fb..e900fbd78e39 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -27,5 +27,6 @@ $(eval $(call gb_Module_add_targets_for_build,unoidl, \
 
 $(eval $(call gb_Module_add_check_targets,unoidl, \
     CustomTarget_unoidl-write_test \
+    $(if $(filter ODK,$(BUILD_TYPE)),CustomTarget_unoidl-check_test) \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/unoidl/qa/unoidl-check/other1.idl b/unoidl/qa/unoidl-check/other1.idl
new file mode 100644
index 000000000000..75473015bc82
--- /dev/null
+++ b/unoidl/qa/unoidl-check/other1.idl
@@ -0,0 +1 @@
+module M { enum X { V }; };
diff --git a/unoidl/qa/unoidl-check/other2.idl b/unoidl/qa/unoidl-check/other2.idl
new file mode 100644
index 000000000000..f6c94ef66548
--- /dev/null
+++ b/unoidl/qa/unoidl-check/other2.idl
@@ -0,0 +1 @@
+enum X { V };
diff --git a/unoidl/qa/unoidl-check/pe.idl b/unoidl/qa/unoidl-check/pe.idl
new file mode 100644
index 000000000000..c597b29f048d
--- /dev/null
+++ b/unoidl/qa/unoidl-check/pe.idl
@@ -0,0 +1 @@
+module M { published enum N { V }; };
diff --git a/unoidl/qa/unoidl-check/psa.idl b/unoidl/qa/unoidl-check/psa.idl
new file mode 100644
index 000000000000..b8079c9add9d
--- /dev/null
+++ b/unoidl/qa/unoidl-check/psa.idl
@@ -0,0 +1 @@
+module M { published struct N { long m; }; };
diff --git a/unoidl/qa/unoidl-check/psb.idl b/unoidl/qa/unoidl-check/psb.idl
new file mode 100644
index 000000000000..03d02b302c96
--- /dev/null
+++ b/unoidl/qa/unoidl-check/psb.idl
@@ -0,0 +1 @@
+module M { published struct N { short m; }; };
diff --git a/unoidl/qa/unoidl-check/ue.idl b/unoidl/qa/unoidl-check/ue.idl
new file mode 100644
index 000000000000..0face3356b23
--- /dev/null
+++ b/unoidl/qa/unoidl-check/ue.idl
@@ -0,0 +1 @@
+module M { enum N { V }; };
diff --git a/unoidl/qa/unoidl-check/usa.idl b/unoidl/qa/unoidl-check/usa.idl
new file mode 100644
index 000000000000..80fe2c2f4c2e
--- /dev/null
+++ b/unoidl/qa/unoidl-check/usa.idl
@@ -0,0 +1 @@
+module M { struct N { long m; }; };
diff --git a/unoidl/qa/unoidl-check/usb.idl b/unoidl/qa/unoidl-check/usb.idl
new file mode 100644
index 000000000000..08e7e9daa9d4
--- /dev/null
+++ b/unoidl/qa/unoidl-check/usb.idl
@@ -0,0 +1 @@
+module M { struct N { short m; }; };