[Libreoffice-commits] core.git: include/test test/inc test/Library_subsequenttest.mk test/Library_test.mk test/source

2019-03-29 Thread Jens Carl (via logerrit) 
 include/test/helper/form.hxx|6 +++---
 test/Library_subsequenttest.mk  |1 -
 test/Library_test.mk|1 -
 test/source/helper/form.cxx |2 +-
 test/source/view/xcontrolaccess.cxx |2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 413bfc34423b950fa5a9f9a6edc2f3d36b1e638b
Author: Jens Carl 
AuthorDate: Fri Mar 29 18:54:53 2019 +
Commit: Jens Carl 
CommitDate: Fri Mar 29 23:04:32 2019 +0100

Move UNO Api helper form to include/

Move UNO Api helper form to include/, so it can be used outside of
directory test/.

Change-Id: I9392f44df8a93d2b5ee092b0458aeef12f99fc7a
Reviewed-on: https://gerrit.libreoffice.org/69936
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/test/inc/helper/form.hxx b/include/test/helper/form.hxx
similarity index 91%
rename from test/inc/helper/form.hxx
rename to include/test/helper/form.hxx
index 271f06be0b7e..f6e035d64fec 100644
--- a/test/inc/helper/form.hxx
+++ b/include/test/helper/form.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_TEST_INC_HELPER_FORM_HXX
-#define INCLUDED_TEST_INC_HELPER_FORM_HXX
+#ifndef INCLUDED_TEST_HELPER_FORM_HXX
+#define INCLUDED_TEST_HELPER_FORM_HXX
 
 #include 
 #include 
@@ -44,6 +44,6 @@ css::uno::Reference 
OOO_DLLPUBLIC_TEST createContro
 } // namespace helper
 } // namespace apitest
 
-#endif // INCLUDED_TEST_INC_HELPER_FORM_HXX
+#endif // INCLUDED_TEST_HELPER_FORM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 65d9d1f7efd8..42cec9343c75 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,subsequenttest))
 
 $(eval $(call gb_Library_set_include,subsequenttest,\
-   -I$(SRCDIR)/test/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/test/Library_test.mk b/test/Library_test.mk
index f80cacf6ed9a..ce318d95471c 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,test))
 
 $(eval $(call gb_Library_set_include,test,\
-   -I$(SRCDIR)/test/inc \
 $$(INCLUDE) \
 ))
 
diff --git a/test/source/helper/form.cxx b/test/source/helper/form.cxx
index 610bd43f1a51..3dbf079af59d 100644
--- a/test/source/helper/form.cxx
+++ b/test/source/helper/form.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/test/source/view/xcontrolaccess.cxx 
b/test/source/view/xcontrolaccess.cxx
index 5f00e88a5f63..2c24d85328c8 100644
--- a/test/source/view/xcontrolaccess.cxx
+++ b/test/source/view/xcontrolaccess.cxx
@@ -8,7 +8,7 @@
  */
 
 #include 
-#include 
+#include 
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/test test/inc test/Library_subsequenttest.mk test/Library_test.mk test/source

2018-03-21 Thread Jens Carl 
 test/Library_subsequenttest.mk  |5 +
 test/Library_test.mk|5 +
 test/inc/unoapi_property_testers.hxx|6 +++---
 test/source/sheet/spreadsheet.cxx   |2 +-
 test/source/unoapi_property_testers.cxx |2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit fc3f43b6fe3df5e46ca869d5934d4c444881
Author: Jens Carl 
Date:   Wed Mar 21 05:12:54 2018 +

Move UNO API property testers header file

Move the header file form the global include path include/test to the
module-specific path test/inc.

Change-Id: I72c1f3b420bc387f4f5b9ab75f30f0e8462c1b75
Reviewed-on: https://gerrit.libreoffice.org/51682
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index 1e8fdb134770..ce88ef80a817 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,subsequenttest))
 
+$(eval $(call gb_Library_set_include,subsequenttest,\
+-I$(SRCDIR)/test/inc \
+$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_add_defs,subsequenttest,\
-DOOO_DLLIMPLEMENTATION_TEST \
 ))
diff --git a/test/Library_test.mk b/test/Library_test.mk
index 47d0ffbec381..553eb2a3f148 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,test))
 
+$(eval $(call gb_Library_set_include,test,\
+-I$(SRCDIR)/test/inc \
+$$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_add_defs,test,\
 -DOOO_DLLIMPLEMENTATION_TEST \
 ))
diff --git a/include/test/unoapi_property_testers.hxx 
b/test/inc/unoapi_property_testers.hxx
similarity index 93%
rename from include/test/unoapi_property_testers.hxx
rename to test/inc/unoapi_property_testers.hxx
index 369ab586d366..1449df16b719 100644
--- a/include/test/unoapi_property_testers.hxx
+++ b/test/inc/unoapi_property_testers.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_TEST_SHEET_UNOAPIPROPERTYHELPER_HXX
-#define INCLUDED_TEST_SHEET_UNOAPIPROPERTYHELPER_HXX
+#ifndef INCLUDED_TEST_INC_UNOAPIPROPERTYTESTERS_HXX
+#define INCLUDED_TEST_INC_UNOAPIPROPERTYTESTERS_HXX
 
 #include 
 #include 
@@ -56,6 +56,6 @@ void OOO_DLLPUBLIC_TEST
 testStringProperty(css::uno::Reference& xPropertySet,
const OUString& name, const OUString& rValue);
 }
-#endif // INCLUDED_TEST_SHEET_UNOAPIPROPERTYHELPER_HXX
+#endif // INCLUDED_TEST_INC_UNOAPIPROPERTYTESTERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/test/source/sheet/spreadsheet.cxx 
b/test/source/sheet/spreadsheet.cxx
index 6ff83c475e46..f63c3667deee 100644
--- a/test/source/sheet/spreadsheet.cxx
+++ b/test/source/sheet/spreadsheet.cxx
@@ -8,7 +8,7 @@
  */
 
 #include 
-#include 
+#include 
 
 #include 
 #include 
diff --git a/test/source/unoapi_property_testers.cxx 
b/test/source/unoapi_property_testers.cxx
index 08fde5ebd5d0..756321a7e317 100644
--- a/test/source/unoapi_property_testers.cxx
+++ b/test/source/unoapi_property_testers.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
+#include 
 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits