diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2013-03-31 00:07:11 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2013-03-31 00:07:11 +0000 |
| commit | 1f4cd9dfff0c4d250ecab33f44c41466b70b4daf (patch) | |
| tree | e1d909b93595c6a31b0978557f75d8e7d75a5df6 /src/VBox/Runtime/testcase/tstUtf8.cpp | |
| parent | 4ef8f122cde07f4f5b839a941032e0c435835482 (diff) | |
| download | VirtualBox-svn-1f4cd9dfff0c4d250ecab33f44c41466b70b4daf.tar.gz | |
We should probably check the iconv return value a little more closely. Currently trying VWRN_NO_TRANSLATION instead of VERR_NO_TRANSLATION as tstUtf8 originally expected. Adjusted tstUtf8. Seen trouble in this area on testboxsh1 where neither LC_ALL, LANG nor LC_CTYPE were set.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@45260 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/Runtime/testcase/tstUtf8.cpp')
| -rw-r--r-- | src/VBox/Runtime/testcase/tstUtf8.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/VBox/Runtime/testcase/tstUtf8.cpp b/src/VBox/Runtime/testcase/tstUtf8.cpp index dec4df06cb0..1344fccee48 100644 --- a/src/VBox/Runtime/testcase/tstUtf8.cpp +++ b/src/VBox/Runtime/testcase/tstUtf8.cpp @@ -1396,7 +1396,7 @@ static void testNoTransation(RTTEST hTest) RTTestSub(hTest, "VERR_NO_TRANSLATION/RTStrUtf8ToCurrentCP"); char *pszOut; rc = RTStrUtf8ToCurrentCP(&pszOut, pszTest1); - if (RT_SUCCESS(rc)) + if (rc == VINF_SUCCESS) { RTTESTI_CHECK(!strcmp(pszOut, pszTest1)); RTTestIPrintf(RTTESTLVL_ALWAYS, "CurrentCP is UTF-8 or similar (LC_ALL=%s LANG=%s LC_CTYPE=%s)\n", @@ -1404,7 +1404,7 @@ static void testNoTransation(RTTEST hTest) RTStrFree(pszOut); } else - RTTESTI_CHECK_RC(rc, VERR_NO_TRANSLATION); + RTTESTI_CHECK_MSG(rc == VWRN_NO_TRANSLATION || rc == VERR_NO_TRANSLATION, ("rc=%Rrc\n", rc)); RTTestSub(hTest, "VERR_NO_TRANSLATION/RTUtf16ToLatin1"); rc = RTUtf16ToLatin1(s_swzTest1, &pszOut); |