From 4cd8c49cc84c4f7cc7f19575423aab200cfaf7b2 Mon Sep 17 00:00:00 2001 From: Michael Ow Date: Mon, 15 Jun 2009 03:06:50 +0000 Subject: [PATCH] ICU-6905 Make heap mutex test in cintltst pass w/o data. X-SVN-Rev: 26101 --- icu4c/source/test/cintltst/calltest.c | 2 +- icu4c/source/test/cintltst/hpmufn.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/icu4c/source/test/cintltst/calltest.c b/icu4c/source/test/cintltst/calltest.c index 5068f6e9bf2..ba05242bc06 100644 --- a/icu4c/source/test/cintltst/calltest.c +++ b/icu4c/source/test/cintltst/calltest.c @@ -44,8 +44,8 @@ void addAllTests(TestNode** root) { addCnvSelTest(root); addUDataTest(root); - addHeapMutexTest(root); addPUtilTest(root); + addHeapMutexTest(root); addUTF16Test(root); addUTF8Test(root); addUtility(root); diff --git a/icu4c/source/test/cintltst/hpmufn.c b/icu4c/source/test/cintltst/hpmufn.c index 9af301746c8..eedd44fbc55 100644 --- a/icu4c/source/test/cintltst/hpmufn.c +++ b/icu4c/source/test/cintltst/hpmufn.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 2003-2006, International Business Machines Corporation and + * Copyright (c) 2003-2009, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ /* @@ -47,7 +47,7 @@ static int32_t gMutexFailures = 0; #define TEST_STATUS(status, expected) \ if (status != expected) { \ -log_err("FAIL at %s:%d. Actual status = \"%s\"; Expected status = \"%s\"\n", \ +log_err_status(status, "FAIL at %s:%d. Actual status = \"%s\"; Expected status = \"%s\"\n", \ __FILE__, __LINE__, u_errorName(status), u_errorName(expected)); gMutexFailures++; }