summaryrefslogtreecommitdiff
path: root/sal/qa/osl/security/osl_Security_Const.h
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-07-10 14:43:03 +0300
committerTor Lillqvist <tml@iki.fi>2011-07-10 14:43:03 +0300
commit51f0313728164fdb38dda2b49c7e0b52d78bc4dc (patch)
tree919f039bbf1721f063aa6ba436491a42ed37fa67 /sal/qa/osl/security/osl_Security_Const.h
parentbfd84a6ddb9e055908b5f02826a8c2cbd815ea59 (diff)
Do build sal unit tests for iOS, too
We can't run them in the normal way, but we build the tests as static archives, which we link into the single sal_cppunittester_all executable. (Work in progress, so far just a part of the tests are linked into it.) There is no makefilery yet to actually construct a complete iOS app bundle (.app directory), so just copy (in this case) the sal_cppunittester_all iOS executable on top of the executbale some dummy iOS app you build in Xcode... works fine, can be debugged that way.
Diffstat (limited to 'sal/qa/osl/security/osl_Security_Const.h')
-rw-r--r--sal/qa/osl/security/osl_Security_Const.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/sal/qa/osl/security/osl_Security_Const.h b/sal/qa/osl/security/osl_Security_Const.h
index 9298324a5..197745f7d 100644
--- a/sal/qa/osl/security/osl_Security_Const.h
+++ b/sal/qa/osl/security/osl_Security_Const.h
@@ -63,11 +63,15 @@ const char pTestString[17] = "Sun Microsystems";
//------------------------------------------------------------------------
// condition names
//------------------------------------------------------------------------
-OSLTEST_DECLARE_USTRING( NullURL, "" );
-::rtl::OUString aLogonUser( aNullURL ), aLogonPasswd( aNullURL ), aFileServer( aNullURL ), aStringForward( aNullURL );
-::rtl::OUString strUserName( aNullURL ) , strComputerName( aNullURL ) , strHomeDirectory( aNullURL );
-::rtl::OUString strConfigDirectory( aNullURL ), strUserID( aNullURL );
+// Intentionally different from the aNullURL in osl_File_Const.h to avoid
+// duplicate symbols as all the unit tests here get linked together for iOS...
+
+OSLTEST_DECLARE_USTRING( NullUrl, "" );
+
+::rtl::OUString aLogonUser( aNullUrl ), aLogonPasswd( aNullUrl ), aFileServer( aNullUrl ), aStringForward( aNullUrl );
+::rtl::OUString strUserName( aNullUrl ) , strComputerName( aNullUrl ) , strHomeDirectory( aNullUrl );
+::rtl::OUString strConfigDirectory( aNullUrl ), strUserID( aNullUrl );
sal_Bool isAdmin = sal_False;