Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz

[yaz-moved-to-github.git] / test / test_ccl.c

diff --git a/test/test_ccl.c b/test/test_ccl.c
index dada1e0..f3b04b3 100644 (file)
--- a/test/test_ccl.c
+++ b/test/test_ccl.c
@@ -2,8 +2,9 @@
  * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
-
-/* CCL test */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
 #include <yaz/ccl_xml.h>
@@ -241,18 +242,10 @@ void tst1(int pass)
                             "@or @attr 4=2 @attr 1=1016 a "
                             "@attr 1=/my/title a "));
 
-    /* Bug #2895 */
-#if 1
-    YAZ_CHECK(tst_ccl_query(bibset, "a? b?", 
-                            /* incorrect. */
-                            "@and @attr 4=2 @attr 1=1016 a? "
-                            "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
-#else
     YAZ_CHECK(tst_ccl_query(bibset, "a? b?", 
                             /* correct */
                             "@and @attr 5=1 @attr 4=2 @attr 1=1016 a "
                             "@attr 5=1 @attr 4=2 @attr 1=1016 b "));
-#endif
     ccl_qual_rm(&bibset);
 }