projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
For ICU enabled YAZ defined YAZ_HAVE_ICU instead of HAVE_ICU.
[yaz-moved-to-github.git]
/
test
/
tst_icu_I18N.c
diff --git
a/test/tst_icu_I18N.c
b/test/tst_icu_I18N.c
index
1d6e205
..
cf328ad
100644
(file)
--- a/
test/tst_icu_I18N.c
+++ b/
test/tst_icu_I18N.c
@@
-1,4
+1,4
@@
-/* $Id: tst_icu_I18N.c,v 1.11 2007-10-29 13:50:57 marc Exp $
+/* $Id: tst_icu_I18N.c,v 1.12 2007-11-08 08:17:18 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-33,7
+33,7
@@
#include <yaz/test.h>
#include <yaz/test.h>
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
#include <yaz/icu_I18N.h>
#include <string.h>
#include <yaz/icu_I18N.h>
#include <string.h>
@@
-514,7
+514,6
@@
void test_icu_I18N_chain(int argc, char **argv)
YAZ_CHECK(icu_chain_assign_cstr(chain, en_str, &status));
YAZ_CHECK(icu_chain_assign_cstr(chain, en_str, &status));
- //printf("ICU chain:\ninput: '%s'\n", en_str);
while (icu_chain_next_token(chain, &status)){
;
/* printf("%d '%s' '%s'\n",
while (icu_chain_next_token(chain, &status)){
;
/* printf("%d '%s' '%s'\n",
@@
-681,7
+680,7
@@
void test_chain_empty_chain(void)
icu_chain_destroy(chain);
}
icu_chain_destroy(chain);
}
-#endif // HAVE_ICU
+#endif /* YAZ_HAVE_ICU */
/* DO NOT EDIT THIS FILE IF YOUR EDITOR DOES NOT SUPPORT UTF-8 */
/* DO NOT EDIT THIS FILE IF YOUR EDITOR DOES NOT SUPPORT UTF-8 */
@@
-691,7
+690,7
@@
int main(int argc, char **argv)
YAZ_CHECK_INIT(argc, argv);
YAZ_CHECK_LOG();
YAZ_CHECK_INIT(argc, argv);
YAZ_CHECK_LOG();
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
test_icu_I18N_casemap(argc, argv);
test_icu_I18N_sortmap(argc, argv);
test_icu_I18N_casemap(argc, argv);
test_icu_I18N_sortmap(argc, argv);
@@
-702,13
+701,13
@@
int main(int argc, char **argv)
test_chain_empty_chain();
test_bug_1140();
test_chain_empty_chain();
test_bug_1140();
-#else /* HAVE_ICU */
+#else /* YAZ_HAVE_ICU */
printf("ICU unit tests omitted.\n"
"Please install libicu36-dev and icu-doc or similar\n");
YAZ_CHECK(0 == 0);
printf("ICU unit tests omitted.\n"
"Please install libicu36-dev and icu-doc or similar\n");
YAZ_CHECK(0 == 0);
-#endif /* HAVE_ICU */
+#endif /* YAZ_HAVE_ICU */
YAZ_CHECK_TERM;
}
YAZ_CHECK_TERM;
}