diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-01 10:23:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-01 10:23:37 +0000 |
| commit | 521d6cbfc26a87605284b3e669b973822128c184 (patch) | |
| tree | ffc0785ad50c61f9800fcf731186b7edc6ffa4f4 /sal | |
| parent | 05b56ad8917d9e0fbed1f1e8437b5ac08e7fa999 (diff) | |
INTEGRATION: CWS native177 (1.10.10); FILE MERGED
2008/07/23 15:57:49 sb 1.10.10.1: #i92049# .override failed for non-existing files
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index b1aef4fe88a6..1e791ba2eaf1 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: rtl_Bootstrap.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -769,13 +769,20 @@ namespace rtl_Bootstrap } void testOverride() { - rtl::OUString t( + rtl::OUString t1( RTL_CONSTASCII_USTRINGPARAM( "${.override:$ORIGIN/" SAL_CONFIGFILE("rtl") ":ORIGIN}")); - Bootstrap(t_getSourcePath("rtl")).expandMacrosFrom(t); + Bootstrap(t_getSourcePath("rtl")).expandMacrosFrom(t1); CPPUNIT_ASSERT_MESSAGE( - "override", - t.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("direct"))); + "override ORIGIN", + t1.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("direct"))); + rtl::OUString t2( + RTL_CONSTASCII_USTRINGPARAM( + "${.override:$ORIGIN/" SAL_CONFIGFILE("none") ":MYVAR}")); + Bootstrap::expandMacros(t2); + CPPUNIT_ASSERT_MESSAGE( + "override MYVAR", + t2.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("src680_test"))); } void testSection() { |