[Libreoffice-commits] .: 3 commits - sal/prj sal/qa
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Feb 23 04:48:52 PST 2011
sal/prj/build.lst | 1
sal/qa/osl/condition/makefile.mk | 2
sal/qa/osl/file/makefile.mk | 6 +-
sal/qa/osl/module/makefile.mk | 2
sal/qa/osl/security/makefile.mk | 2
sal/qa/osl/socket/makefile.mk | 16 +++---
sal/qa/osl/thread/makefile.mk | 2
sal/qa/rtl/alloc/jobfile.txt | 8 ---
sal/qa/rtl/alloc/makefile.mk | 13 -----
sal/qa/rtl/alloc/rtl_alloc.cxx | 85 ++++++++++++---------------------
sal/qa/rtl/bootstrap/makefile.mk | 2
sal/qa/rtl/cipher/makefile.mk | 2
sal/qa/rtl/crc32/makefile.mk | 2
sal/qa/rtl/digest/makefile.mk | 2
sal/qa/rtl/doublelock/makefile.mk | 2
sal/qa/rtl/locale/makefile.mk | 2
sal/qa/rtl/logfile/makefile.mk | 2
sal/qa/rtl/math/makefile.mk | 6 +-
sal/qa/rtl/ostring/makefile.mk | 6 +-
sal/qa/rtl/oustring/makefile.mk | 4 -
sal/qa/rtl/process/makefile.mk | 2
sal/qa/rtl/random/makefile.mk | 2
sal/qa/rtl/textenc/makefile.mk | 4 -
sal/qa/rtl/uri/makefile.mk | 4 -
sal/qa/rtl/uuid/makefile.mk | 2
sal/qa/rtl_strings/makefile.mk | 12 ++--
sal/qa/sal/makefile.mk | 2
sal/qa/systools/makefile.mk | 2
sal/qa/testHelperFunctions/makefile.mk | 2
29 files changed, 80 insertions(+), 119 deletions(-)
New commits:
commit ca13ff4f5ab7adfe5bc2b25fb3d10586c484d29a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 23 12:48:28 2011 +0000
remove dead jobfile.txt
diff --git a/sal/qa/rtl/alloc/jobfile.txt b/sal/qa/rtl/alloc/jobfile.txt
deleted file mode 100755
index 012ae24..0000000
--- a/sal/qa/rtl/alloc/jobfile.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# JobFile for rtl_alloc
-# header source sal/inc/rtl/alloc.h
-
-rtl_alloc.test.rtl_allocateMemory_001
-rtl_alloc.test.rtl_reallocateMemory_001
-rtl_alloc.test.rtl_freeMemory_001
-rtl_alloc.test.rtl_allocateZeroMemory_001
-
commit 0a81fdb611dd863e17ffa3742d85dcb47fff7041
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 23 12:46:51 2011 +0000
get rid of spurious TESTSHL2LIB mentions
diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index 99c9b5d..784f9c2 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -45,7 +45,7 @@ SHL1OBJS= \
$(SLO)$/osl_Condition.obj
SHL1TARGET= osl_Condition
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk
index 8b6b1ff..1fad4b4 100644
--- a/sal/qa/osl/file/makefile.mk
+++ b/sal/qa/osl/file/makefile.mk
@@ -43,7 +43,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
SHL1OBJS= \
$(SLO)$/osl_File.obj
SHL1TARGET= osl_File
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
@@ -54,7 +54,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
SHL2OBJS=$(SLO)$/test_cpy_wrt_file.obj
SHL2TARGET=tcwf
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL2IMPLIB=i$(SHL2TARGET)
SHL2DEF=$(MISC)$/$(SHL2TARGET).def
SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
@@ -67,7 +67,7 @@ DEF2NAME =$(SHL2TARGET)
SHL3OBJS= \
$(SLO)$/osl_old_test_file.obj
SHL3TARGET= osl_old_test_file
-SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL3IMPLIB= i$(SHL3TARGET)
diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk
index 3432f18..df44478 100644
--- a/sal/qa/osl/module/makefile.mk
+++ b/sal/qa/osl/module/makefile.mk
@@ -55,7 +55,7 @@ SHL1VERSIONMAP = export_dll.map
SHL2OBJS= $(SLO)$/osl_Module.obj
SHL2TARGET= osl_Module
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL2STDLIBS+=i$(SHL2TARGET).lib
diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk
index 0fe9b05..9fc442f 100755
--- a/sal/qa/osl/security/makefile.mk
+++ b/sal/qa/osl/security/makefile.mk
@@ -45,7 +45,7 @@ SHL1OBJS= \
$(SLO)$/osl_Security.obj
SHL1TARGET= osl_Security
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL1STDLIBS+= $(ADVAPI32LIB)
.ENDIF
diff --git a/sal/qa/osl/socket/makefile.mk b/sal/qa/osl/socket/makefile.mk
index 98e347b..cdc268a 100755
--- a/sal/qa/osl/socket/makefile.mk
+++ b/sal/qa/osl/socket/makefile.mk
@@ -45,7 +45,7 @@ SHL1OBJS= \
$(SLO)$/osl_Socket.obj
SHL1TARGET=osl_SocketOld
-SHL1STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL1STDLIBS+= $(WS2_32LIB)
@@ -67,7 +67,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
SHL2OBJS= \
$(SLO)$/osl_Socket_tests.obj
SHL2TARGET= osl_Socket_tests
-SHL2STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL2IMPLIB= i$(SHL2TARGET)
DEF2NAME= $(SHL2TARGET)
@@ -82,7 +82,7 @@ SHL3OBJS= \
$(SLO)$/osl_StreamSocket.obj
SHL3TARGET= osl_StreamSocket
-SHL3STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL3STDLIBS += $(WS2_32LIB)
@@ -105,7 +105,7 @@ SHL4OBJS= \
$(SLO)$/osl_DatagramSocket.obj
SHL4TARGET= osl_DatagramSocket
-SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL4STDLIBS += $(WS2_32LIB)
@@ -128,7 +128,7 @@ SHL5OBJS= \
$(SLO)$/osl_SocketAddr.obj
SHL5TARGET= osl_SocketAddr
-SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL5STDLIBS += $(WS2_32LIB)
@@ -151,7 +151,7 @@ SHL6OBJS= \
$(SLO)$/osl_Socket2.obj
SHL6TARGET= osl_Socket2
-SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL6STDLIBS += $(WS2_32LIB)
@@ -174,7 +174,7 @@ SHL7OBJS= \
$(SLO)$/osl_ConnectorSocket.obj
SHL7TARGET= osl_ConnectorSocket
-SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL7STDLIBS += $(WS2_32LIB)
@@ -197,7 +197,7 @@ SHL8OBJS= \
$(SLO)$/osl_AcceptorSocket.obj
SHL8TARGET= osl_AcceptorSocket
-SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB)
.IF "$(GUI)" == "WNT"
SHL8STDLIBS += $(WS2_32LIB)
diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk
index 73ca4ec..949fe0b 100644
--- a/sal/qa/osl/thread/makefile.mk
+++ b/sal/qa/osl/thread/makefile.mk
@@ -37,7 +37,7 @@ DLLPRE = # no leading "lib" on .so files
SHL1TARGET = $(TARGET)
SHL1OBJS = $(SLO)$/test_thread.obj
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index efc23ec..8175540 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -28,8 +28,6 @@ PRJ=..$/..$/..
PRJNAME=sal
TARGET=qa_rtl_alloc
-# this is removed at the moment because we need some enhancements
-# TESTDIR=TRUE
ENABLE_EXCEPTIONS=TRUE
@@ -42,22 +40,15 @@ CXXFLAGS+= $(LFS_CFLAGS)
CFLAGSCXX += $(CPPUNIT_CFLAGS)
-# BEGIN ----------------------------------------------------------------
-# auto generated Target:jobfile by codegen.pl
-SHL1OBJS= \
- $(SLO)$/rtl_alloc.obj
+SHL1OBJS= $(SLO)$/rtl_alloc.obj
SHL1TARGET= rtl_Alloc
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME =$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
-# auto generated Target:jobfile
-# END ------------------------------------------------------------------
#------------------------------- All object files -------------------------------
# do this here, so we get right dependencies
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index a82dc05..ca4166a 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -37,7 +37,6 @@
#include <cppunit/plugin/TestPlugIn.h>
#include <memory.h>
-#define t_print printf
namespace rtl_alloc
{
@@ -66,31 +65,25 @@ class Memory : public CppUnit::TestFixture
public:
Memory()
- :m_pMemory(NULL),
- m_nSizeOfMemory(50 * 1024 * 1024)
- {
- }
+ : m_pMemory(NULL)
+ , m_nSizeOfMemory(1024)
+ {
+ }
// initialise your test code values here.
void setUp()
{
- t_print("allocate memory\n");
- m_pMemory = (char*) rtl_allocateMemory( m_nSizeOfMemory );
+ m_pMemory = (char*) rtl_allocateMemory( m_nSizeOfMemory );
}
void tearDown()
{
- t_print("free memory\n");
- rtl_freeMemory(m_pMemory);
- m_pMemory = NULL;
+ rtl_freeMemory(m_pMemory);
+ m_pMemory = NULL;
}
- // insert your test code here.
void rtl_allocateMemory_001()
{
- // this is demonstration code
- // CPPUNIT_ASSERT_MESSAGE("a message", 1 == 1);
-
CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pMemory != NULL);
memset(m_pMemory, 1, m_nSizeOfMemory);
CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, m_nSizeOfMemory, 1) == true);
@@ -98,8 +91,7 @@ public:
void rtl_reallocateMemory_001()
{
- t_print("reallocate memory\n");
- sal_uInt32 nSize = 10 * 1024 * 1024;
+ sal_uInt32 nSize = 2 * 1024;
m_pMemory = (char*)rtl_reallocateMemory(m_pMemory, nSize);
CPPUNIT_ASSERT_MESSAGE( "Can reallocate memory.", m_pMemory != NULL);
@@ -107,19 +99,9 @@ public:
CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pMemory, nSize, 2) == true);
}
- // void rtl_freeMemory_001()
- // {
- // // CPPUNIT_ASSERT_STUB();
- // }
-
- // Change the following lines only, if you add, remove or rename
- // member functions of the current class,
- // because these macros are need by auto register mechanism.
-
CPPUNIT_TEST_SUITE(Memory);
CPPUNIT_TEST(rtl_allocateMemory_001);
CPPUNIT_TEST(rtl_reallocateMemory_001);
- // CPPUNIT_TEST(rtl_freeMemory_001);
CPPUNIT_TEST_SUITE_END();
}; // class test
@@ -131,45 +113,39 @@ class ZeroMemory : public CppUnit::TestFixture
public:
ZeroMemory()
- :m_pZeroMemory(NULL),
- m_nSizeOfZeroMemory( 50 * 1024 * 1024 )
- {
- }
+ : m_pZeroMemory(NULL)
+ , m_nSizeOfZeroMemory( 50 * 1024 * 1024 )
+ {
+ }
// initialise your test code values here.
void setUp()
- {
- t_print("allocate zero memory\n");
- m_pZeroMemory = (char*) rtl_allocateZeroMemory( m_nSizeOfZeroMemory );
- }
+ {
+ m_pZeroMemory = (char*) rtl_allocateZeroMemory( m_nSizeOfZeroMemory );
+ }
void tearDown()
{
- t_print("free zero memory\n");
- rtl_freeZeroMemory(m_pZeroMemory, m_nSizeOfZeroMemory);
- // LLA: no check possible, may GPF if there is something wrong.
- // CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", pZeroMemory != NULL);
+ rtl_freeZeroMemory(m_pZeroMemory, m_nSizeOfZeroMemory);
+ // LLA: no check possible, may GPF if there is something wrong.
+ // CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", pZeroMemory != NULL);
}
// insert your test code here.
void rtl_allocateZeroMemory_001()
{
- CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pZeroMemory != NULL);
- CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 0) == true);
+ CPPUNIT_ASSERT_MESSAGE( "Can get zero memory.", m_pZeroMemory != NULL);
+ CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 0) == true);
- memset(m_pZeroMemory, 3, m_nSizeOfZeroMemory);
- CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 3) == true);
+ memset(m_pZeroMemory, 3, m_nSizeOfZeroMemory);
+ CPPUNIT_ASSERT_MESSAGE( "memory contains wrong value.", checkMemory(m_pZeroMemory, m_nSizeOfZeroMemory, 3) == true);
}
- // Change the following lines only, if you add, remove or rename
- // member functions of the current class,
- // because these macros are need by auto register mechanism.
-
CPPUNIT_TEST_SUITE(ZeroMemory);
CPPUNIT_TEST(rtl_allocateZeroMemory_001);
CPPUNIT_TEST_SUITE_END();
-}; // class test
+};
// -----------------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::Memory);
@@ -177,10 +153,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::ZeroMemory);
} // namespace rtl_alloc
-// -----------------------------------------------------------------------------
-
-// this macro creates an empty function, which will called by the RegisterAllFunctions()
-// to let the user the possibility to also register some functions by hand.
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/rtl/bootstrap/makefile.mk b/sal/qa/rtl/bootstrap/makefile.mk
index 4d0efaa..c1b9c2f 100644
--- a/sal/qa/rtl/bootstrap/makefile.mk
+++ b/sal/qa/rtl/bootstrap/makefile.mk
@@ -56,7 +56,7 @@ SHL1OBJS= \
$(SLO)$/rtl_Bootstrap.obj
SHL1TARGET= rtl_Bootstrap
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index 06b30ff..ced0747 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS= \
$(SLO)$/rtl_cipher.obj
SHL1TARGET= rtl_cipher
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index 0002e53..b8b33a5 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS= \
$(SLO)$/rtl_crc32.obj
SHL1TARGET= rtl_crc32
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/digest/makefile.mk b/sal/qa/rtl/digest/makefile.mk
index 8d6077a..d6c557f 100644
--- a/sal/qa/rtl/digest/makefile.mk
+++ b/sal/qa/rtl/digest/makefile.mk
@@ -45,7 +45,7 @@ SHL1OBJS= \
$(SLO)$/rtl_digest.obj
SHL1TARGET= rtl_digest
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME= $(SHL1TARGET)
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 622eca8..50f6583 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -53,7 +53,7 @@ SHL1OBJS= \
$(SLO)$/rtl_doublelocking.obj
SHL1TARGET= rtl_doublelocking
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index a9c6973..2256a70 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS= \
$(SLO)$/rtl_locale.obj
SHL1TARGET= rtl_locale
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl/logfile/makefile.mk b/sal/qa/rtl/logfile/makefile.mk
index d6b2065..6660011 100644
--- a/sal/qa/rtl/logfile/makefile.mk
+++ b/sal/qa/rtl/logfile/makefile.mk
@@ -45,7 +45,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
SHL1OBJS= \
$(SLO)$/rtl_logfile.obj
SHL1TARGET= rtl_logfile
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
diff --git a/sal/qa/rtl/math/makefile.mk b/sal/qa/rtl/math/makefile.mk
index 6b7a8c2..a978849 100644
--- a/sal/qa/rtl/math/makefile.mk
+++ b/sal/qa/rtl/math/makefile.mk
@@ -49,7 +49,7 @@ SHL1OBJS= \
$(SLO)$/test_rtl_math.obj
SHL1TARGET= rtl_math
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
@@ -62,7 +62,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
SHL2OBJS= \
$(SLO)$/rtl_math.obj
SHL2TARGET= rtl_math2
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL2IMPLIB= i$(SHL2TARGET)
DEF2NAME= $(SHL2TARGET)
@@ -79,7 +79,7 @@ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
# SHL3OBJS= \
# $(SLO)$/rtl_old_testint64.obj
# SHL3TARGET= rtl_old_testint64
-# SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+# SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
#
# SHL3IMPLIB= i$(SHL3TARGET)
# DEF3NAME= $(SHL3TARGET)
diff --git a/sal/qa/rtl/ostring/makefile.mk b/sal/qa/rtl/ostring/makefile.mk
index 0ff4245..5436736 100644
--- a/sal/qa/rtl/ostring/makefile.mk
+++ b/sal/qa/rtl/ostring/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS= \
$(SLO)$/rtl_OString2.obj
SHL1TARGET= rtl_OString2
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
@@ -64,7 +64,7 @@ SHL2OBJS= \
$(SLO)$/rtl_str.obj
SHL2TARGET= rtl_str
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL2IMPLIB= i$(SHL2TARGET)
DEF2NAME =$(SHL2TARGET)
@@ -76,7 +76,7 @@ SHL3OBJS= \
$(SLO)$/rtl_string.obj
SHL3TARGET= rtl_string
-SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL3IMPLIB= i$(SHL3TARGET)
DEF3NAME =$(SHL3TARGET)
diff --git a/sal/qa/rtl/oustring/makefile.mk b/sal/qa/rtl/oustring/makefile.mk
index 936f9f6..b848603 100644
--- a/sal/qa/rtl/oustring/makefile.mk
+++ b/sal/qa/rtl/oustring/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS= \
$(SLO)$/rtl_OUString2.obj
SHL1TARGET= rtl_OUString2
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
@@ -64,7 +64,7 @@ SHL2OBJS= \
$(SLO)$/rtl_ustr.obj
SHL2TARGET= rtl_ustr
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL2IMPLIB= i$(SHL2TARGET)
DEF2NAME =$(SHL2TARGET)
diff --git a/sal/qa/rtl/process/makefile.mk b/sal/qa/rtl/process/makefile.mk
index c680c19..e3a26c9 100644
--- a/sal/qa/rtl/process/makefile.mk
+++ b/sal/qa/rtl/process/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS= \
$(SLO)$/rtl_Process.obj
SHL1TARGET= rtl_Process
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
diff --git a/sal/qa/rtl/random/makefile.mk b/sal/qa/rtl/random/makefile.mk
index 6835a1a..ef5a86c 100644
--- a/sal/qa/rtl/random/makefile.mk
+++ b/sal/qa/rtl/random/makefile.mk
@@ -42,7 +42,7 @@ SHL1OBJS= \
$(SLO)$/rtl_random.obj
SHL1TARGET= rtl_Random
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk
index 8353621..4e61262 100644
--- a/sal/qa/rtl/textenc/makefile.mk
+++ b/sal/qa/rtl/textenc/makefile.mk
@@ -45,7 +45,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
SHL1OBJS= \
$(SLO)$/rtl_textcvt.obj
SHL1TARGET= rtl_textcvt
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
@@ -57,7 +57,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
SHL2OBJS= \
$(SLO)$/rtl_tencinfo.obj
SHL2TARGET= rtl_tencinfo
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL2IMPLIB= i$(SHL2TARGET)
DEF2NAME =$(SHL2TARGET)
diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk
index 9972705..5d3fc19 100644
--- a/sal/qa/rtl/uri/makefile.mk
+++ b/sal/qa/rtl/uri/makefile.mk
@@ -45,7 +45,7 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS)
SHL1OBJS= \
$(SLO)$/rtl_Uri.obj
SHL1TARGET= rtl_uri_simple
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
@@ -57,7 +57,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
SHL2OBJS= \
$(SLO)$/rtl_testuri.obj
SHL2TARGET= rtl_Uri
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL2IMPLIB= i$(SHL2TARGET)
DEF2NAME =$(SHL2TARGET)
diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk
index 0158741..ff1dc96 100644
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS= \
$(SLO)$/rtl_Uuid.obj
SHL1TARGET= rtl_Uuid
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/rtl_strings/makefile.mk b/sal/qa/rtl_strings/makefile.mk
index 1774928..ceb465a 100644
--- a/sal/qa/rtl_strings/makefile.mk
+++ b/sal/qa/rtl_strings/makefile.mk
@@ -46,7 +46,7 @@ SHL1OBJS= \
$(SLO)$/rtl_OString.obj
SHL1TARGET= rtl_OString
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
@@ -65,7 +65,7 @@ SHL2OBJS= \
$(SLO)$/rtl_OUString.obj
SHL2TARGET= rtl_OUString
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL2IMPLIB= i$(SHL2TARGET)
# SHL2DEF= $(MISC)$/$(SHL2TARGET).def
@@ -84,7 +84,7 @@ SHL3OBJS= \
$(SLO)$/rtl_OUStringBuffer.obj
SHL3TARGET= rtl_OUStringBuffer
-SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL3IMPLIB= i$(SHL3TARGET)
# SHL3DEF= $(MISC)$/$(SHL3TARGET).def
@@ -101,7 +101,7 @@ SHL4OBJS= \
$(SLO)$/rtl_old_teststrbuf.obj
SHL4TARGET= rtl_old_teststrbuf
-SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL4IMPLIB= i$(SHL4TARGET)
DEF4NAME =$(SHL4TARGET)
@@ -114,7 +114,7 @@ SHL5OBJS= \
$(SLO)$/rtl_old_testowstring.obj
SHL5TARGET= rtl_old_testowstring
-SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL5IMPLIB= i$(SHL5TARGET)
DEF5NAME =$(SHL5TARGET)
@@ -127,7 +127,7 @@ SHL6OBJS= \
$(SLO)$/rtl_old_testostring.obj
SHL6TARGET= rtl_old_testostring
-SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL6IMPLIB= i$(SHL6TARGET)
DEF6NAME =$(SHL6TARGET)
diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk
index 594eaa7..954d339 100644
--- a/sal/qa/sal/makefile.mk
+++ b/sal/qa/sal/makefile.mk
@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS := TRUE
SHL1TARGET = $(TARGET)_types
SHL1OBJS = $(SLO)$/test_types.obj
-SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS = $(SALLIB) $(CPPUNITLIB)
SHL1VERSIONMAP = version.map
SHL1IMPLIB = i$(SHL1TARGET)
DEF1NAME = $(SHL1TARGET)
diff --git a/sal/qa/systools/makefile.mk b/sal/qa/systools/makefile.mk
index 9113358..7b3798b 100644
--- a/sal/qa/systools/makefile.mk
+++ b/sal/qa/systools/makefile.mk
@@ -48,7 +48,7 @@ SHL1OBJS= \
$(SLO)$/test_comtools.obj
SHL1TARGET= test_comtools
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) uuid.lib
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) uuid.lib
SHL1IMPLIB= i$(SHL1TARGET)
# SHL1DEF= $(MISC)$/$(SHL1TARGET).def
diff --git a/sal/qa/testHelperFunctions/makefile.mk b/sal/qa/testHelperFunctions/makefile.mk
index f5777ba..e7c2f98 100644
--- a/sal/qa/testHelperFunctions/makefile.mk
+++ b/sal/qa/testHelperFunctions/makefile.mk
@@ -45,7 +45,7 @@ SHL1OBJS= \
$(SLO)$/testHelperFunctions2.obj
SHL1TARGET= testHelperFunctions
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB)
SHL1IMPLIB= i$(SHL1TARGET)
DEF1NAME =$(SHL1TARGET)
commit 7a10c5af23a5d1ad295a5812aa1a85487f547254
Author: Wilhelm Pflueger <Wilhelm.Pflueger at web.de>
Date: Tue Feb 22 22:33:33 2011 +0100
Reanimated test sal/qa/rtl/alloc
This was an easy hack.
Signed-off-by: Wilhelm Pflueger <Wilhelm.Pflueger at web.de>
diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 40e5e5c..ddbc446 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -25,3 +25,4 @@ sa sal\qa\osl\security nmake - all sa_qa_osl_security sa_cppunittester sa_util N
sa sal\qa\osl\process nmake - all sa_qa_osl_process sa_cppunittester sa_util NULL
sa sal\qa\rtl\strings nmake - all sa_qa_rt_strings sa_cppunittester sa_util NULL
sa sal\qa\rtl\oustringbuffer nmake - all sa_qa_rt_oustringbuffer sa_cppunittester sa_util NULL
+sa sal\qa\rtl\alloc nmake - all sa_qa_rt_alloc sa_cppunittester sa_util NULL
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index cc44528..a82dc05 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -32,7 +32,12 @@
// autogenerated file with codegen.pl
#include <rtl/alloc.h>
-#include <testshl/simpleheader.hxx>
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>
+
+#include <memory.h>
+#define t_print printf
namespace rtl_alloc
{
@@ -167,8 +172,8 @@ public:
}; // class test
// -----------------------------------------------------------------------------
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_alloc::Memory, "rtl_alloc");
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_alloc::ZeroMemory, "rtl_alloc");
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::Memory);
+CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::ZeroMemory);
} // namespace rtl_alloc
@@ -176,6 +181,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_alloc::ZeroMemory, "rtl_alloc");
// this macro creates an empty function, which will called by the RegisterAllFunctions()
// to let the user the possibility to also register some functions by hand.
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list