Merge branch 'master' into turbomarc

diff --combined test/.gitignore
index a3a7d13,ad09bef..6c57ec2
--- 1/test/.gitignore
--- 2/test/.gitignore
+++ b/test/.gitignore
@@@ -1,41 -1,38 +1,41 @@@
  .deps
  Makefile
  Makefile.in
- tstodrcodec.c
- tstodrcodec.h
+ test_odrcodec.c
+ test_odrcodec.h
  .libs
- tstccl
- tsticonv
- tstmatchstr
- tstnmem
- tstodr
- tstwrbuf
- tstlog
- tstsoap1
- tstsoap2
- tstodrstack
- tstlogthread
- tstxmlquery
- tstpquery
- tstxmalloc
- tst_filepath
- tst_record_conv
- tst_retrieval
- tst_tpath
- tst_timing
- tst_comstack
- tst_query_charset
- tst_icu_I18N
- tst_match_glob
- tst_rpn2cql
- tst_json
- tst_xml_include
- nfatest1
- nfaxmltest1
- tst_oid
+ test_ccl
+ test_iconv
+ test_matchstr
+ test_nmem
+ test_odr
+ test_wrbuf
+ test_log
+ test_soap1
+ test_soap2
+ test_odrstack
+ test_logthread
+ test_xmlquery
+ test_pquery
+ test_xmalloc
+ test_filepath
+ test_record_conv
+ test_retrieval
+ test_tpath
+ test_timing
+ test_comstack
+ test_query_charset
+ test_icu
+ test_match_glob
+ test_rpn2cql
+ test_json
+ test_xml_include
+ test_oid
+ test_file_glob
+ test_log_thread
  *.log
  *.o
  *~
 +*.diff
 +*.hex*
 +*.revert*