sal: only allowed one unit-test per gnumakefile, so separate these

This commit is contained in:
Michael Meeks
2012-01-21 17:01:15 +00:00
parent 90bcb4b519
commit 22815db58f
4 changed files with 82 additions and 24 deletions
-24
View File
@@ -37,28 +37,4 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_file,\
$(gb_STDLIBS) \
))
# sal_osl_old_test_file
$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_old_test_file))
$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\
sal/qa/osl/file/osl_old_test_file \
))
$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_old_test_file,\
sal \
$(gb_STDLIBS) \
))
# sal_tcwf
$(eval $(call gb_CppunitTest_CppunitTest,sal_tcwf))
$(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\
sal/qa/osl/file/test_cpy_wrt_file \
))
$(eval $(call gb_CppunitTest_add_linked_libs,sal_tcwf,\
sal \
$(gb_STDLIBS) \
))
# vim: set noet sw=4 ts=4:
+40
View File
@@ -0,0 +1,40 @@
# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# Major Contributor(s):
# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
#
# All Rights Reserved.
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
# sal_osl_old_test_file
$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_old_test_file))
$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\
sal/qa/osl/file/osl_old_test_file \
))
$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_old_test_file,\
sal \
$(gb_STDLIBS) \
))
# vim: set noet sw=4 ts=4:
+40
View File
@@ -0,0 +1,40 @@
# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# Major Contributor(s):
# Copyright (C) 2011 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
#
# All Rights Reserved.
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
# sal_tcwf
$(eval $(call gb_CppunitTest_CppunitTest,sal_tcwf))
$(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\
sal/qa/osl/file/test_cpy_wrt_file \
))
$(eval $(call gb_CppunitTest_add_linked_libs,sal_tcwf,\
sal \
$(gb_STDLIBS) \
))
# vim: set noet sw=4 ts=4:
+2
View File
@@ -48,6 +48,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_osl_file \
CppunitTest_sal_osl_module \
CppunitTest_sal_osl_mutex \
CppunitTest_sal_osl_old_test_file \
CppunitTest_sal_osl_process \
CppunitTest_sal_osl_profile \
CppunitTest_sal_osl_security \
@@ -61,6 +62,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_rtl_ostringbuffer \
CppunitTest_sal_rtl_oustringbuffer \
CppunitTest_sal_rtl_strings \
CppunitTest_sal_tcwf \
CppunitTest_sal_types \
))