From 048f5e6847a4d1f9ed139b6ab7edaaddd80e42b3 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 4 Feb 2016 13:43:12 +0100
Subject: Resurrect registry/test/regcompare/

Change-Id: Icf4d3b4137a6b6b70dd543bf4758a79f90e9f57f
---
 registry/CustomTarget_regcompare_test.mk | 141 +++++++++++++++++++++++++++++++
 registry/Module_registry.mk              |   4 +
 registry/test/regcompare/makefile.mk     |  98 ---------------------
 3 files changed, 145 insertions(+), 98 deletions(-)
 create mode 100644 registry/CustomTarget_regcompare_test.mk
 delete mode 100644 registry/test/regcompare/makefile.mk

(limited to 'registry')

diff --git a/registry/CustomTarget_regcompare_test.mk b/registry/CustomTarget_regcompare_test.mk
new file mode 100644
index 000000000000..d0781db773bb
--- /dev/null
+++ b/registry/CustomTarget_regcompare_test.mk
@@ -0,0 +1,141 @@
+# -*- 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,regcompare) \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+        $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd
+	$(call gb_Helper_abbreviate_dirs,( \
+        $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.urd \
+        && $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.urd \
+        && ! $(call gb_Executable_get_command,regcompare) -f -t -u \
+            -r1 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.urd \
+            -r2 $(call gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.urd) \
+        > $@.log 2>&1 || (cat $@.log && false))
+
+$(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 fb962c64c012..ec476c98f7b2 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -24,6 +24,10 @@ $(eval $(call gb_Module_add_targets,registry,\
 	Executable_regcompare \
 ))
 
+$(eval $(call gb_Module_add_check_targets,registry, \
+    CustomTarget_regcompare_test \
+))
+
 endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/registry/test/regcompare/makefile.mk b/registry/test/regcompare/makefile.mk
deleted file mode 100644
index 53b41a9fca65..000000000000
--- a/registry/test/regcompare/makefile.mk
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# 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 .
-#
-
-PRJ := ..$/..
-PRJNAME := registry
-TARGET := test_regcompare
-
-.INCLUDE: settings.mk
-.INCLUDE: target.mk
-
-ALLTAR: test
-
-test .PHONY: $(MISC)$/$(TARGET)$/psa.urd $(MISC)$/$(TARGET)$/psb.urd \
-        $(MISC)$/$(TARGET)$/usa.urd $(MISC)$/$(TARGET)$/usb.urd \
-        $(MISC)$/$(TARGET)$/pe.urd $(MISC)$/$(TARGET)$/ue.urd \
-        $(MISC)$/$(TARGET)$/other1.urd $(MISC)$/$(TARGET)$/other2.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/psa.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/psb.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/usa.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/usb.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/pe.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/ue.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/other1.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/other2.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/psa.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/psb.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/usa.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/usb.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/pe.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/ue.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/other1.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/psa.urd -r2 $(MISC)$/$(TARGET)$/other2.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/psa.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/psb.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/usa.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/usb.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/pe.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/ue.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/other1.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/other2.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/psa.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/psb.urd
-    $(EXECTEST) -SUCCESS $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/usa.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/usb.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/pe.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/ue.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/other1.urd
-    $(EXECTEST) -FAILURE $(BIN)/regcompare$(EXECPOST) -f -t -u \
-        -r1 $(MISC)$/$(TARGET)$/usa.urd -r2 $(MISC)$/$(TARGET)$/other2.urd
-
-$(MISC)$/$(TARGET)$/%.urd: %.idl
-    $(IDLC) -O$(MISC)$/$(TARGET) -cid -we $<
-- 
cgit