diff options
| author | sb <sb@openoffice.org> | 2009-12-11 14:29:59 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-12-11 14:29:59 +0100 |
| commit | 0d8e2caa55d25f0e7040a55b96c93f37fb52a8f3 (patch) | |
| tree | 84259165d4304543a2476b5a5dbb16e98dcf4c50 /sal/prj | |
| parent | d89afea42e33bb771cd9a31fbdc71b94ba4d8679 (diff) | |
sb118: Replace (heavily modified) CppUnit 1.8.0 with (unmodified) latest 1.12.1.
- Old modifications were necessary for testshl2, which has simply been excluded
from the build for now.
- Tests in basebmp, basegfx, o3tl (that are executed during build) have been
converted from using modified CppUnit/testshl2 to using unmodified CppUnit.
- CppUnit's DllPlugInTester has problems with OOo tests on Windows, see
#i107562#, so for now a new cppunittester from sal is used instead.
Diffstat (limited to 'sal/prj')
| -rw-r--r-- | sal/prj/build.lst | 3 | ||||
| -rw-r--r-- | sal/prj/d.lst | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sal/prj/build.lst b/sal/prj/build.lst index 5622d80edeef..6985584b63bb 100644 --- a/sal/prj/build.lst +++ b/sal/prj/build.lst @@ -1,4 +1,4 @@ -sa sal : xml2cmp stlport external BOOST:boost NULL +sa sal : xml2cmp stlport external BOOST:boost cppunit NULL sa sal usr1 - all sa_mkout NULL sa sal\inc nmake - all sa_inc NULL sa sal\typesconfig nmake - u sa_tc sa_inc NULL @@ -14,3 +14,4 @@ sa sal\qa nmake - all sa_qa sa_util NULL sa sal\osl\unx nmake - u sa_oslu sa_tc.u sa_inc NULL sa sal\osl\all nmake - all sa_oslall sa_tc.u sa_inc NULL sa sal\util nmake - all sa_util sa_tc.u sa_oslall sa_uwinapi.n sa_kill.n sa_onlineupdate.n sa_osln.n sa_oslp.p sa_oslu.u sa_rtl sa_textenc NULL +sa sal\cppunittester nmake - all sa_cppunittester sa_util NULL diff --git a/sal/prj/d.lst b/sal/prj/d.lst index bcd9c0e2c95a..3ce270bbbfc4 100644 --- a/sal/prj/d.lst +++ b/sal/prj/d.lst @@ -34,3 +34,5 @@ symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib ..\%__SRC%\inc\udkversion.h %_DEST%\inc%_EXT%\sal\udkversion.h +..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunittester +..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunittester.exe |