Imported Upstream version 0.7.8
[platform/upstream/libsolv.git] / ext / testcase.c
index 72f9dc8..d6c4a57 100644 (file)
@@ -7,8 +7,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <limits.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +15,7 @@
 #include "pool.h"
 #include "poolarch.h"
 #include "poolvendor.h"
+#include "evr.h"
 #include "repo.h"
 #include "repo_solv.h"
 #include "solver.h"
 #include "testcase.h"
 #include "selection.h"
 #include "solv_xfopen.h"
+#if ENABLE_TESTCASE_HELIXREPO
+#include "ext/repo_helix.h"
+#endif
+
+#ifdef _WIN32
+  #include <direct.h>
+#endif
+
+/* see repo_testcase.c */
+struct oplist {
+  Id flags;
+  const char *opname;
+};
+extern struct oplist oplist[];
 
-#define DISABLE_JOIN2
-#include "tools_util.h"
 
 static struct job2str {
   Id job;
   const char *str;
 } job2str[] = {
-  { SOLVER_NOOP,          "noop" },
-  { SOLVER_INSTALL,       "install" },
-  { SOLVER_ERASE,         "erase" },
-  { SOLVER_UPDATE,        "update" },
-  { SOLVER_WEAKENDEPS,    "weakendeps" },
-  { SOLVER_MULTIVERSION,  "multiversion" },
-  { SOLVER_MULTIVERSION,  "noobsoletes" },     /* old name */
-  { SOLVER_LOCK,          "lock" },
-  { SOLVER_DISTUPGRADE,   "distupgrade" },
-  { SOLVER_VERIFY,        "verify" },
-  { SOLVER_DROP_ORPHANED, "droporphaned" },
-  { SOLVER_USERINSTALLED, "userinstalled" },
+  { SOLVER_NOOP,           "noop" },
+  { SOLVER_INSTALL,        "install" },
+  { SOLVER_ERASE,          "erase" },
+  { SOLVER_UPDATE,         "update" },
+  { SOLVER_WEAKENDEPS,     "weakendeps" },
+  { SOLVER_MULTIVERSION,   "multiversion" },
+  { SOLVER_MULTIVERSION,   "noobsoletes" },    /* old name */
+  { SOLVER_LOCK,           "lock" },
+  { SOLVER_DISTUPGRADE,    "distupgrade" },
+  { SOLVER_VERIFY,         "verify" },
+  { SOLVER_DROP_ORPHANED,  "droporphaned" },
+  { SOLVER_USERINSTALLED,  "userinstalled" },
+  { SOLVER_ALLOWUNINSTALL, "allowuninstall" },
+  { SOLVER_FAVOR,          "favor" },
+  { SOLVER_DISFAVOR,       "disfavor" },
+  { SOLVER_BLACKLIST,      "blacklist" },
   { 0, 0 }
 };
 
@@ -58,6 +73,7 @@ static struct jobflags2str {
   { SOLVER_ORUPDATE,  "orupdate" },
   { SOLVER_FORCEBEST, "forcebest" },
   { SOLVER_TARGETED,  "targeted" },
+  { SOLVER_NOTBYUSER, "notbyuser" },
   { SOLVER_SETEV,     "setev" },
   { SOLVER_SETEVR,    "setevr" },
   { SOLVER_SETARCH,   "setarch" },
@@ -76,6 +92,13 @@ static struct resultflags2str {
   { TESTCASE_RESULT_ORPHANED,          "orphaned" },
   { TESTCASE_RESULT_RECOMMENDED,       "recommended" },
   { TESTCASE_RESULT_UNNEEDED,          "unneeded" },
+  { TESTCASE_RESULT_ALTERNATIVES,      "alternatives" },
+  { TESTCASE_RESULT_RULES,             "rules" },
+  { TESTCASE_RESULT_GENID,             "genid" },
+  { TESTCASE_RESULT_REASON,            "reason" },
+  { TESTCASE_RESULT_CLEANDEPS,         "cleandeps" },
+  { TESTCASE_RESULT_JOBS,              "jobs" },
+  { TESTCASE_RESULT_USERINSTALLED,     "userinstalled" },
   { 0, 0 }
 };
 
@@ -97,6 +120,20 @@ static struct solverflags2str {
   { SOLVER_FLAG_KEEP_EXPLICIT_OBSOLETES,    "keepexplicitobsoletes", 0 },
   { SOLVER_FLAG_BEST_OBEY_POLICY,           "bestobeypolicy", 0 },
   { SOLVER_FLAG_NO_AUTOTARGET,              "noautotarget", 0 },
+  { SOLVER_FLAG_DUP_ALLOW_DOWNGRADE,        "dupallowdowngrade", 1 },
+  { SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE,       "dupallowarchchange", 1 },
+  { SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE,     "dupallowvendorchange", 1 },
+  { SOLVER_FLAG_DUP_ALLOW_NAMECHANGE,       "dupallownamechange", 1 },
+  { SOLVER_FLAG_KEEP_ORPHANS,               "keeporphans", 0 },
+  { SOLVER_FLAG_BREAK_ORPHANS,              "breakorphans", 0 },
+  { SOLVER_FLAG_FOCUS_INSTALLED,            "focusinstalled", 0 },
+  { SOLVER_FLAG_YUM_OBSOLETES,              "yumobsoletes", 0 },
+  { SOLVER_FLAG_NEED_UPDATEPROVIDE,         "needupdateprovide", 0 },
+  { SOLVER_FLAG_URPM_REORDER,               "urpmreorder", 0 },
+  { SOLVER_FLAG_FOCUS_BEST,                 "focusbest", 0 },
+  { SOLVER_FLAG_STRONG_RECOMMENDS,          "strongrecommends", 0 },
+  { SOLVER_FLAG_INSTALL_ALSO_UPDATES,       "installalsoupdates", 0 },
+  { SOLVER_FLAG_ONLY_NAMESPACE_RECOMMENDED, "onlynamespacerecommended", 0 },
   { 0, 0, 0 }
 };
 
@@ -110,8 +147,13 @@ static struct poolflags2str {
   { POOL_FLAG_OBSOLETEUSESPROVIDES,         "obsoleteusesprovides", 0 },
   { POOL_FLAG_IMPLICITOBSOLETEUSESPROVIDES, "implicitobsoleteusesprovides", 0 },
   { POOL_FLAG_OBSOLETEUSESCOLORS,           "obsoleteusescolors", 0 },
+  { POOL_FLAG_IMPLICITOBSOLETEUSESCOLORS,   "implicitobsoleteusescolors", 0 },
   { POOL_FLAG_NOINSTALLEDOBSOLETES,         "noinstalledobsoletes", 0 },
   { POOL_FLAG_HAVEDISTEPOCH,                "havedistepoch", 0 },
+  { POOL_FLAG_NOOBSOLETESMULTIVERSION,      "noobsoletesmultiversion", 0 },
+  { POOL_FLAG_ADDFILEPROVIDESFILTERED,      "addfileprovidesfiltered", 0 },
+  { POOL_FLAG_NOWHATPROVIDESAUX,            "nowhatprovidesaux", 0 },
+  { POOL_FLAG_WHATPROVIDESWITHDISABLED,     "whatprovideswithdisabled", 0 },
   { 0, 0, 0 }
 };
 
@@ -122,6 +164,8 @@ static struct disttype2str {
   { DISTTYPE_RPM,  "rpm" },
   { DISTTYPE_DEB,  "deb" },
   { DISTTYPE_ARCH, "arch" },
+  { DISTTYPE_HAIKU, "haiku" },
+  { DISTTYPE_CONDA, "conda" },
   { 0, 0 }
 };
 
@@ -141,9 +185,28 @@ static struct selflags2str {
   { SELECTION_NOCASE, "nocase" },
   { SELECTION_SOURCE_ONLY, "sourceonly" },
   { SELECTION_WITH_SOURCE, "withsource" },
+  { SELECTION_SKIP_KIND, "skipkind" },
+  { SELECTION_MATCH_DEPSTR, "depstr" },
+  { SELECTION_WITH_DISABLED, "withdisabled" },
+  { SELECTION_WITH_BADARCH, "withbadarch" },
+  { SELECTION_ADD, "add" },
+  { SELECTION_SUBTRACT, "subtract" },
+  { SELECTION_FILTER, "filter" },
   { 0, 0 }
 };
 
+static const char *features[] = {
+#ifdef ENABLE_LINKED_PKGS
+  "linked_packages",
+#endif
+#ifdef ENABLE_COMPLEX_DEPS
+  "complex_deps",
+#endif
+#if ENABLE_TESTCASE_HELIXREPO
+  "testcase_helixrepo",
+#endif
+  0
+};
 
 typedef struct strqueue {
   char **str;
@@ -271,84 +334,7 @@ strqueue_diff(Strqueue *sq1, Strqueue *sq2, Strqueue *osq)
     strqueue_pushjoin(osq, "+", sq2->str[j++], 0);
 }
 
-static inline int
-pool_isknownarch(Pool *pool, Id id)
-{
-  if (!id || id == ID_EMPTY)
-    return 0;
-  if (id == ARCH_SRC || id == ARCH_NOSRC || id == ARCH_NOARCH)
-    return 1;
-  if (!pool->id2arch || (id > pool->lastarch || !pool->id2arch[id]))
-    return 0;
-  return 1;
-}
-
-Id
-testcase_str2dep(Pool *pool, char *s)
-{
-  char *n, *a;
-  Id id;
-  int flags;
-
-  if ((n = strchr(s, '|')) != 0)
-    {    
-      id = testcase_str2dep(pool, n + 1);
-      *n = 0; 
-      id = pool_rel2id(pool, testcase_str2dep(pool, s), id, REL_OR, 1);
-      *n = '|'; 
-      return id;
-    }
-  while (*s == ' ' || *s == '\t')
-    s++;
-  n = s;
-  while (*s && *s != ' ' && *s != '\t' && *s != '<' && *s != '=' && *s != '>')
-    {
-      if (*s == '(')
-       {
-         while (*s && *s != ')')
-           s++;
-       }
-      else
-        s++;
-    }
-  if ((a = strchr(n, '.')) != 0 && a + 1 < s && s[-1] != ')')
-    {
-      Id archid = pool_strn2id(pool, a + 1, s - (a + 1), 0);
-      if (pool_isknownarch(pool, archid))
-       {
-          id = pool_strn2id(pool, n, a - n, 1);
-         id = pool_rel2id(pool, id, archid, REL_ARCH, 1);
-       }
-      else
-        id = pool_strn2id(pool, n, s - n, 1);
-    }
-  else
-    id = pool_strn2id(pool, n, s - n, 1);
-  if (!*s)
-    return id;
-  while (*s == ' ' || *s == '\t')
-    s++;
-  flags = 0;
-  for (;;s++)
-    {  
-      if (*s == '<')
-        flags |= REL_LT;
-      else if (*s == '=')
-        flags |= REL_EQ;
-      else if (*s == '>')
-        flags |= REL_GT;
-      else
-        break;
-    }
-  if (!flags)
-    return id;
-  while (*s == ' ' || *s == '\t')
-    s++;
-  n = s;
-  while (*s && *s != ' ' && *s != '\t')
-    s++;
-  return pool_rel2id(pool, id, pool_strn2id(pool, n, s - n, 1), flags, 1);
-}
+/**********************************************************/
 
 const char *
 testcase_repoid2str(Pool *pool, Id repoid)
@@ -383,18 +369,31 @@ testcase_solvid2str(Pool *pool, Id p)
   n = pool_id2str(pool, s->name);
   e = pool_id2str(pool, s->evr);
   a = pool_id2str(pool, s->arch);
-  str = pool_alloctmpspace(pool, strlen(n) + strlen(e) + strlen(a) + 3); 
-  sprintf(str, "%s-%s.%s", n, e, a); 
+  str = pool_alloctmpspace(pool, strlen(n) + strlen(e) + strlen(a) + 3);
+  sprintf(str, "%s-%s", n, e);
+  if (solvable_lookup_type(s, SOLVABLE_BUILDFLAVOR))
+    {
+      Queue flavorq;
+      int i;
+
+      queue_init(&flavorq);
+      solvable_lookup_idarray(s, SOLVABLE_BUILDFLAVOR, &flavorq);
+      for (i = 0; i < flavorq.count; i++)
+       str = pool_tmpappend(pool, str, "-", pool_id2str(pool, flavorq.elements[i]));
+      queue_free(&flavorq);
+    }
+  if (s->arch)
+    str = pool_tmpappend(pool, str, ".", a);
   if (!s->repo)
     return pool_tmpappend(pool, str, "@", 0);
   if (s->repo->name)
     {
       int l = strlen(str);
-      char *str2 = pool_tmpappend(pool, str, "@", s->repo->name);
-      for (; str2[l]; l++)
-       if (str2[l] == ' ' || str2[l] == '\t')
-         str2[l] = '_';
-      return str2;
+      str = pool_tmpappend(pool, str, "@", s->repo->name);
+      for (; str[l]; l++)
+       if (str[l] == ' ' || str[l] == '\t')
+         str[l] = '_';
+      return str;
     }
   sprintf(buf, "@#%d", s->repo->repoid);
   return pool_tmpappend(pool, str, buf, 0);
@@ -439,6 +438,47 @@ testcase_str2repo(Pool *pool, const char *str)
   return repo;
 }
 
+/* check evr and buildflavors */
+static int
+str2solvid_check(Pool *pool, Solvable *s, const char *start, const char *end, Id evrid)
+{
+  if (!solvable_lookup_type(s, SOLVABLE_BUILDFLAVOR))
+    {
+      /* just check the evr */
+      return evrid && s->evr == evrid;
+    }
+  else
+    {
+      Queue flavorq;
+      int i;
+
+      queue_init(&flavorq);
+      solvable_lookup_idarray(s, SOLVABLE_BUILDFLAVOR, &flavorq);
+      queue_unshift(&flavorq, s->evr);
+      for (i = 0; i < flavorq.count; i++)
+       {
+         const char *part = pool_id2str(pool, flavorq.elements[i]);
+         size_t partl = strlen(part);
+         if (start + partl > end || strncmp(start, part, partl) != 0)
+           break;
+         start += partl;
+         if (i + 1 < flavorq.count)
+           {
+             if (start >= end || *start != '-')
+               break;
+             start++;
+           }
+       }
+      if (i < flavorq.count)
+       {
+         queue_free(&flavorq);
+         return 0;
+       }
+      queue_free(&flavorq);
+      return start == end;
+    }
+}
+
 Id
 testcase_str2solvid(Pool *pool, const char *str)
 {
@@ -478,18 +518,45 @@ testcase_str2solvid(Pool *pool, const char *str)
          if (!nid)
            continue;
          evrid = pool_strn2id(pool, str + i + 1, repostart - (i + 1), 0);
-         if (!evrid)
-           continue;
+         /* first check whatprovides */
          FOR_PROVIDES(p, pp, nid)
            {
              Solvable *s = pool->solvables + p;
-             if (s->name != nid || s->evr != evrid)
+             if (s->name != nid)
                continue;
              if (repo && s->repo != repo)
                continue;
              if (arch && s->arch != arch)
                continue;
-             return p;
+             if (str2solvid_check(pool, s, str + i + 1, str + repostart, evrid))
+               return p;
+           }
+         /* maybe it's not installable and thus not in whatprovides. do a slow search */
+         if (repo)
+           {
+             Solvable *s;
+             FOR_REPO_SOLVABLES(repo, p, s)
+               {
+                 if (s->name != nid)
+                   continue;
+                 if (arch && s->arch != arch)
+                   continue;
+                 if (str2solvid_check(pool, s, str + i + 1, str + repostart, evrid))
+                   return p;
+               }
+           }
+         else
+           {
+             FOR_POOL_SOLVABLES(p)
+               {
+                 Solvable *s = pool->solvables + p;
+                 if (s->name != nid)
+                   continue;
+                 if (arch && s->arch != arch)
+                   continue;
+                 if (str2solvid_check(pool, s, str + i + 1, str + repostart, evrid))
+                   return p;
+               }
            }
        }
     }
@@ -518,12 +585,12 @@ testcase_job2str(Pool *pool, Id how, Id what)
   else if (select == SOLVER_SOLVABLE_NAME)
     {
       selstr = " name ";
-      pkgstr = pool_dep2str(pool, what);
+      pkgstr = testcase_dep2str(pool, what);
     }
   else if (select == SOLVER_SOLVABLE_PROVIDES)
     {
       selstr = " provides ";
-      pkgstr = pool_dep2str(pool, what);
+      pkgstr = testcase_dep2str(pool, what);
     }
   else if (select == SOLVER_SOLVABLE_ONE_OF)
     {
@@ -599,7 +666,7 @@ str2selflags(Pool *pool, char *s)   /* modifies the string! */
            break;
          }
       if (!selflags2str[i].str)
-       pool_debug(pool, SOLV_ERROR, "str2job: unknown selection flag '%s'\n", s);
+       pool_error(pool, 0, "str2job: unknown selection flag '%s'", s);
       s = se;
     }
   return selflags;
@@ -621,132 +688,69 @@ str2jobflags(Pool *pool, char *s)        /* modifies the string */
            break;
          }
       if (!jobflags2str[i].str)
-       pool_debug(pool, SOLV_ERROR, "str2job: unknown job flag '%s'\n", s);
+       pool_error(pool, 0, "str2job: unknown job flag '%s'", s);
       s = se;
     }
   return jobflags;
 }
 
-Id
-testcase_str2job(Pool *pool, const char *str, Id *whatp)
+static Id
+testcase_str2jobsel(Pool *pool, const char *caller, char **pieces, int npieces, Id *whatp)
 {
-  int i;
-  Id job;
-  Id what;
-  char *s;
-  char **pieces = 0;
-  int npieces = 0;
-
-  *whatp = 0;
-  /* so we can patch it */
-  s = pool_tmpjoin(pool, str, 0, 0);
-  /* split it in pieces */
-  for (;;)
-    {
-      while (*s == ' ' || *s == '\t')
-       s++;
-      if (!*s)
-       break;
-      pieces = solv_extend(pieces, npieces, 1, sizeof(*pieces), 7);
-      pieces[npieces++] = s;
-      while (*s && *s != ' ' && *s != '\t')
-       s++;
-      if (*s)
-       *s++ = 0;
-    }
-  if (npieces < 3)
-    {
-      pool_debug(pool, SOLV_ERROR, "str2job: bad line '%s'\n", str);
-      solv_free(pieces);
-      return -1;
-    }
-
-  for (i = 0; job2str[i].str; i++)
-    if (!strcmp(pieces[0], job2str[i].str))
-      break;
-  if (!job2str[i].str)
+  Id job, what;
+  if (!strcmp(pieces[0], "pkg") && npieces == 2)
     {
-      pool_debug(pool, SOLV_ERROR, "str2job: unknown job '%s'\n", str);
-      solv_free(pieces);
-      return -1;
-    }
-  job = job2str[i].job;
-  what = 0;
-  if (npieces > 3)
-    {
-      char *flags = pieces[npieces - 1];
-      if (*flags == '[' && flags[strlen(flags) - 1] == ']')
-       {
-         npieces--;
-         flags++;
-         flags[strlen(flags) - 1] = 0;
-         job |= str2jobflags(pool, flags);
-       }
-    }
-  if (!strcmp(pieces[1], "pkg"))
-    {
-      if (npieces != 3)
-       {
-         pool_debug(pool, SOLV_ERROR, "str2job: bad pkg selector in '%s'\n", str);
-         solv_free(pieces);
-         return -1;
-       }
-      job |= SOLVER_SOLVABLE;
-      what = testcase_str2solvid(pool, pieces[2]);
+      job = SOLVER_SOLVABLE;
+      what = testcase_str2solvid(pool, pieces[1]);
       if (!what)
-       {
-         pool_debug(pool, SOLV_ERROR, "str2job: unknown package '%s'\n", pieces[2]);
-         solv_free(pieces);
-         return -1;
-       }
+       return pool_error(pool, -1, "%s: unknown package '%s'", caller, pieces[1]);
     }
-  else if (!strcmp(pieces[1], "name") || !strcmp(pieces[1], "provides"))
+  else if (!strcmp(pieces[0], "name") || !strcmp(pieces[0], "provides"))
     {
       /* join em again for dep2str... */
       char *sp;
-      for (sp = pieces[2]; sp < pieces[npieces - 1]; sp++)
+      for (sp = pieces[1]; sp < pieces[npieces - 1]; sp++)
        if (*sp == 0)
          *sp = ' ';
       what = 0;
-      if (pieces[1][0] == 'p' && strncmp(pieces[2], "namespace:", 10) == 0)
+      if (pieces[0][0] == 'p' && strncmp(pieces[1], "namespace:", 10) == 0)
        {
-         char *spe = strchr(pieces[2], '(');
-         int l = strlen(pieces[2]);
-         if (spe && pieces[2][l - 1] == ')')
+         char *spe = strchr(pieces[1], '(');
+         int l = strlen(pieces[1]);
+         if (spe && pieces[1][l - 1] == ')')
            {
              /* special namespace provides */
              if (strcmp(spe, "(<NULL>)") != 0)
                {
-                 pieces[2][l - 1] = 0;
+                 pieces[1][l - 1] = 0;
                  what = testcase_str2dep(pool, spe + 1);
-                 pieces[2][l - 1] = ')';
+                 pieces[1][l - 1] = ')';
                }
-             what = pool_rel2id(pool, pool_strn2id(pool, pieces[2], spe - pieces[2], 1), what, REL_NAMESPACE, 1);
+             what = pool_rel2id(pool, pool_strn2id(pool, pieces[1], spe - pieces[1], 1), what, REL_NAMESPACE, 1);
            }
        }
       if (!what)
-        what = testcase_str2dep(pool, pieces[2]);
-      if (pieces[1][0] == 'n')
-       job |= SOLVER_SOLVABLE_NAME;
+        what = testcase_str2dep(pool, pieces[1]);
+      if (pieces[0][0] == 'n')
+       job = SOLVER_SOLVABLE_NAME;
       else
-       job |= SOLVER_SOLVABLE_PROVIDES;
+       job = SOLVER_SOLVABLE_PROVIDES;
     }
-  else if (!strcmp(pieces[1], "oneof"))
+  else if (!strcmp(pieces[0], "oneof"))
     {
       Queue q;
-      job |= SOLVER_SOLVABLE_ONE_OF;
+      job = SOLVER_SOLVABLE_ONE_OF;
       queue_init(&q);
-      if (npieces > 3 && strcmp(pieces[2], "nothing") != 0)
+      if (npieces > 1 && strcmp(pieces[1], "nothing") != 0)
        {
-         for (i = 2; i < npieces; i++)
+         int i;
+         for (i = 1; i < npieces; i++)
            {
              Id p = testcase_str2solvid(pool, pieces[i]);
              if (!p)
                {
-                 pool_debug(pool, SOLV_ERROR, "str2job: unknown package '%s'\n", pieces[i]);
                  queue_free(&q);
-                 solv_free(pieces);
-                 return -1;
+                 return pool_error(pool, -1, "%s: unknown package '%s'", caller, pieces[i]);
                }
              queue_push(&q, p);
            }
@@ -754,64 +758,77 @@ testcase_str2job(Pool *pool, const char *str, Id *whatp)
       what = pool_queuetowhatprovides(pool, &q);
       queue_free(&q);
     }
-  else if (!strcmp(pieces[1], "repo"))
+  else if (!strcmp(pieces[0], "repo") && npieces == 2)
     {
-      Repo *repo;
-      if (npieces != 3)
-       {
-         pool_debug(pool, SOLV_ERROR, "str2job: bad line '%s'\n", str);
-         solv_free(pieces);
-         return -1;
-       }
-      repo = testcase_str2repo(pool, pieces[2]);
+      Repo *repo = testcase_str2repo(pool, pieces[1]);
       if (!repo)
-       {
-         pool_debug(pool, SOLV_ERROR, "str2job: unknown repo '%s'\n", pieces[2]);
-         solv_free(pieces);
-         return -1;
-       }
-      job |= SOLVER_SOLVABLE_REPO;
+       return pool_error(pool, -1, "%s: unknown repo '%s'", caller, pieces[1]);
+      job = SOLVER_SOLVABLE_REPO;
       what = repo->repoid;
     }
-  else if (!strcmp(pieces[1], "all"))
+  else if (!strcmp(pieces[0], "all") && npieces == 2 && !strcmp(pieces[1], "packages"))
     {
-      if (npieces != 3 && strcmp(pieces[2], "packages") != 0)
-       {
-         pool_debug(pool, SOLV_ERROR, "str2job: bad line '%s'\n", str);
-         solv_free(pieces);
-         return -1;
-       }
-      job |= SOLVER_SOLVABLE_ALL;
+      job = SOLVER_SOLVABLE_ALL;
       what = 0;
     }
   else
     {
-      pool_debug(pool, SOLV_ERROR, "str2job: unknown selection in '%s'\n", str);
-      solv_free(pieces);
-      return -1;
+      /* join em again for the error message... */
+      char *sp;
+      for (sp = pieces[0]; sp < pieces[npieces - 1]; sp++)
+       if (*sp == 0)
+         *sp = ' ';
+      return pool_error(pool, -1, "%s: bad line '%s'", caller, pieces[0]);
     }
   *whatp = what;
-  solv_free(pieces);
   return job;
 }
 
-int
-addselectionjob(Pool *pool, char **pieces, int npieces, Queue *jobqueue)
+Id
+testcase_str2job(Pool *pool, const char *str, Id *whatp)
 {
-  Id job;
-  int i, r;
-  int selflags;
-  Queue sel;
+  int i;
+  Id job, jobsel;
+  Id what;
+  char *s;
+  char **pieces = 0;
+  int npieces = 0;
+
+  *whatp = 0;
+  /* so we can patch it */
+  s = pool_tmpjoin(pool, str, 0, 0);
+  /* split it in pieces */
+  for (;;)
+    {
+      while (*s == ' ' || *s == '\t')
+       s++;
+      if (!*s)
+       break;
+      pieces = solv_extend(pieces, npieces, 1, sizeof(*pieces), 7);
+      pieces[npieces++] = s;
+      while (*s && *s != ' ' && *s != '\t')
+       s++;
+      if (*s)
+       *s++ = 0;
+    }
+  if (npieces < 3)
+    {
+      pool_error(pool, -1, "str2job: bad line '%s'", str);
+      solv_free(pieces);
+      return -1;
+    }
 
   for (i = 0; job2str[i].str; i++)
     if (!strcmp(pieces[0], job2str[i].str))
       break;
   if (!job2str[i].str)
     {
-      pool_debug(pool, SOLV_ERROR, "selstr2job: unknown job '%s'\n", pieces[0]);
+      pool_error(pool, -1, "str2job: unknown job '%s'", str);
+      solv_free(pieces);
       return -1;
     }
   job = job2str[i].job;
+  what = 0;
   if (npieces > 3)
     {
       char *flags = pieces[npieces - 1];
@@ -823,368 +840,70 @@ addselectionjob(Pool *pool, char **pieces, int npieces, Queue *jobqueue)
          job |= str2jobflags(pool, flags);
        }
     }
-  if (npieces < 4)
-    {
-      pool_debug(pool, SOLV_ERROR, "selstr2job: no selection flags\n");
-      return -1;
-    }
-  selflags = str2selflags(pool, pieces[3]);
-  queue_init(&sel);
-  r = selection_make(pool, &sel, pieces[2], selflags);
-  for (i = 0; i < sel.count; i += 2)
-    queue_push2(jobqueue, job | sel.elements[i], sel.elements[i + 1]);
-  queue_free(&sel);
-  return r;
-}
-
-static void
-writedeps(Repo *repo, FILE *fp, const char *tag, Id key, Solvable *s, Offset off)
-{
-  Pool *pool = repo->pool;
-  Id id, *dp, *prvdp;
-  int tagwritten = 0;
-  const char *idstr;
-
-  if (!off)
-    return;
-  dp = repo->idarraydata + off;
-  prvdp = 0;
-  while ((id = *dp++) != 0)
-    {
-      if (key == SOLVABLE_REQUIRES && id == SOLVABLE_PREREQMARKER)
-       {
-         if (tagwritten)
-           fprintf(fp, "-%s\n", tag);
-         tagwritten = 0;
-         tag = "Prq:";
-         continue;
-       }
-      if (key == SOLVABLE_PROVIDES && id == SOLVABLE_FILEMARKER)
-       {
-         prvdp = dp;
-         continue;
-       }
-      idstr = pool_dep2str(pool, id);
-      if (ISRELDEP(id))
-       {
-         Reldep *rd = GETRELDEP(pool, id);
-         if (key == SOLVABLE_CONFLICTS && rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_OTHERPROVIDERS)
-           {
-             if (!strncmp(idstr, "namespace:", 10))
-               idstr += 10;
-           }
-         if (key == SOLVABLE_SUPPLEMENTS)
-           {
-             if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_FILESYSTEM)
-               {
-                 if (!strncmp(idstr, "namespace:", 10))
-                   idstr += 10;
-               }
-             else if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_MODALIAS)
-               {
-                 if (!strncmp(idstr, "namespace:", 10))
-                   idstr += 10;
-               }
-             else if (rd->flags == REL_AND)
-               {
-                 /* either packageand chain or modalias */
-                 idstr = 0;
-                 if (ISRELDEP(rd->evr))
-                   {
-                     Reldep *mrd = GETRELDEP(pool, rd->evr);
-                     if (mrd->flags == REL_NAMESPACE && mrd->name == NAMESPACE_MODALIAS)
-                       {
-                         idstr = pool_tmpjoin(pool, "modalias(", pool_dep2str(pool, rd->name), ":");
-                         idstr = pool_tmpappend(pool, idstr, pool_dep2str(pool, mrd->evr), ")");
-                       }
-                     else if (mrd->flags >= 8)
-                       continue;
-                   }
-                 if (!idstr)
-                   {
-                     /* must be and chain */
-                     idstr = pool_dep2str(pool, rd->evr);
-                     for (;;)
-                       {
-                         id = rd->name;
-                         if (!ISRELDEP(id))
-                           break;
-                         rd = GETRELDEP(pool, id);
-                         if (rd->flags != REL_AND)
-                           break;
-                         idstr = pool_tmpjoin(pool, pool_dep2str(pool, rd->evr), ":", idstr);
-                       }
-                     idstr = pool_tmpjoin(pool, pool_dep2str(pool, id), ":", idstr);
-                     idstr = pool_tmpjoin(pool, "packageand(", idstr, ")");
-                   }
-               }
-             else if (rd->flags >= 8)
-               continue;
-           }
-       }
-      if (!tagwritten)
-       {
-         fprintf(fp, "+%s\n", tag);
-         tagwritten = 1;
-       }
-      fprintf(fp, "%s\n", idstr);
-    }
-  if (key == SOLVABLE_PROVIDES)
-    {
-      /* add the filelist */
-      Dataiterator di;
-      dataiterator_init(&di, pool, repo, s - pool->solvables, SOLVABLE_FILELIST, 0, 0);
-      while (dataiterator_step(&di))
-       {
-         const char *s = repodata_dir2str(di.data, di.kv.id, di.kv.str);
-         if (prvdp)
-           {
-             Id id = pool_str2id(pool, s, 0);
-             if (id)
-               {
-                 for (dp = prvdp; *dp; dp++)
-                   if (*dp == id)
-                     break;
-                 if (*dp)
-                   continue;   /* already included */
-               }
-           }
-         if (!tagwritten)
-           {
-             fprintf(fp, "+%s", tag);
-             tagwritten = 1;
-           }
-         fprintf(fp, "%s\n", s);
-       }
-    }
-  if (tagwritten)
-    fprintf(fp, "-%s\n", tag);
-}
-
-int
-testcase_write_testtags(Repo *repo, FILE *fp)
-{
-  Pool *pool = repo->pool;
-  Solvable *s;
-  Id p;
-  const char *name;
-  const char *evr;
-  const char *arch;
-  const char *release;
-  const char *tmp;
-  unsigned int ti;
-
-  fprintf(fp, "=Ver: 2.0\n");
-  FOR_REPO_SOLVABLES(repo, p, s)
-    {
-      name = pool_id2str(pool, s->name);
-      evr = pool_id2str(pool, s->evr);
-      arch = pool_id2str(pool, s->arch);
-      release = strrchr(evr, '-');
-      if (!release)
-       release = evr + strlen(evr);
-      fprintf(fp, "=Pkg: %s %.*s %s %s\n", name, (int)(release - evr), evr, *release && release[1] ? release + 1 : "-", arch);
-      tmp = solvable_lookup_str(s, SOLVABLE_SUMMARY);
-      if (tmp)
-        fprintf(fp, "=Sum: %s\n", tmp);
-      writedeps(repo, fp, "Req:", SOLVABLE_REQUIRES, s, s->requires);
-      writedeps(repo, fp, "Prv:", SOLVABLE_PROVIDES, s, s->provides);
-      writedeps(repo, fp, "Obs:", SOLVABLE_OBSOLETES, s, s->obsoletes);
-      writedeps(repo, fp, "Con:", SOLVABLE_CONFLICTS, s, s->conflicts);
-      writedeps(repo, fp, "Rec:", SOLVABLE_RECOMMENDS, s, s->recommends);
-      writedeps(repo, fp, "Sup:", SOLVABLE_SUPPLEMENTS, s, s->supplements);
-      writedeps(repo, fp, "Sug:", SOLVABLE_SUGGESTS, s, s->suggests);
-      writedeps(repo, fp, "Enh:", SOLVABLE_ENHANCES, s, s->enhances);
-      if (s->vendor)
-       fprintf(fp, "=Vnd: %s\n", pool_id2str(pool, s->vendor));
-      ti = solvable_lookup_num(s, SOLVABLE_BUILDTIME, 0);
-      if (ti)
-       fprintf(fp, "=Tim: %u\n", ti);
-    }
-  return 0;
+  jobsel = testcase_str2jobsel(pool, "str2job", pieces + 1, npieces - 1, &what);
+  solv_free(pieces);
+  if (jobsel == -1)
+    return -1;
+  *whatp = what;
+  return job | jobsel;
 }
 
-static inline Offset
-adddep(Repo *repo, Offset olddeps, char *str, Id marker)
-{
-  Id id = *str == '/' ? pool_str2id(repo->pool, str, 1) : testcase_str2dep(repo->pool, str);
-  return repo_addid_dep(repo, olddeps, id, marker);
-}
+#define SELECTIONJOB_MATCHDEPS         1
+#define SELECTIONJOB_MATCHDEPID                2
+#define SELECTIONJOB_MATCHSOLVABLE     3
 
-static void
-finish_solvable(Pool *pool, Repodata *data, Solvable *s, char *filelist, int nfilelist)
+static int
+addselectionjob(Pool *pool, char **pieces, int npieces, Queue *jobqueue, int type, int keyname)
 {
-  if (nfilelist)
-    {
-      int l;
-      Id did; 
-      for (l = 0; l < nfilelist; l += strlen(filelist + l) + 1) 
-       {
-         char *p = strrchr(filelist + l, '/');
-         if (!p) 
-           continue;
-         *p++ = 0; 
-         did = repodata_str2dir(data, filelist + l, 1);
-         p[-1] = '/'; 
-         if (!did)
-           did = repodata_str2dir(data, "/", 1);
-         repodata_add_dirstr(data, s - pool->solvables, SOLVABLE_FILELIST, did, p);
-       }
-    }
-  if (s->name && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)
-    s->provides = repo_addid_dep(s->repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
-  s->supplements = repo_fix_supplements(s->repo, s->provides, s->supplements, 0);
-  s->conflicts = repo_fix_conflicts(s->repo, s->conflicts);
-}
+  Id job;
+  int i, r = 0;
+  int selflags;
+  Queue sel;
+  char *sp;
 
-/* stripped down version of susetags parser used for testcases */
-int
-testcase_add_testtags(Repo *repo, FILE *fp, int flags)
-{
-  Pool *pool = repo->pool;
-  char *line, *linep;
-  int aline;
-  int tag;
-  Repodata *data;
-  Solvable *s;
-  char *sp[5];
-  unsigned int t;
-  int intag;
-  char *filelist = 0;
-  int afilelist = 0;
-  int nfilelist = 0;
-
-  data = repo_add_repodata(repo, flags);
-  s = 0;
-  intag = 0;
-
-  aline = 1024;
-  line = solv_malloc(aline);
-  linep = line;
-  for (;;)
+  for (i = 0; job2str[i].str; i++)
+    if (!strcmp(pieces[0], job2str[i].str))
+      break;
+  if (!job2str[i].str)
+    return pool_error(pool, -1, "selstr2job: unknown job '%s'", pieces[0]);
+  job = job2str[i].job;
+  if (npieces > 3)
     {
-      if (linep - line + 16 > aline)
-       {
-         aline = linep - line;
-         line = solv_realloc(line, aline + 512);
-         linep = line + aline;
-         aline += 512;
-       }
-      if (!fgets(linep, aline - (linep - line), fp))
-       break;
-      linep += strlen(linep);
-      if (linep == line || linep[-1] != '\n')
-       continue;
-      *--linep = 0;
-      linep = line + intag;
-      if (intag)
-       {
-         if (line[intag] == '-' && !strncmp(line + 1, line + intag + 1, intag - 2))
-           {
-             intag = 0;
-             linep = line;
-             continue;
-           }
-       }
-      else if (line[0] == '+' && line[1] && line[1] != ':')
+      char *flags = pieces[npieces - 1];
+      if (*flags == '[' && flags[strlen(flags) - 1] == ']')
        {
-         char *tagend = strchr(line, ':');
-         if (!tagend)
-           continue;
-         line[0] = '=';
-         tagend[1] = ' ';
-         intag = tagend + 2 - line;
-         linep = line + intag;
-         continue;
+         npieces--;
+         flags++;
+         flags[strlen(flags) - 1] = 0;
+         job |= str2jobflags(pool, flags);
        }
-      if (*line != '=' || !line[1] || !line[2] || !line[3] || line[4] != ':')
-       continue;
-      tag = line[1] << 16 | line[2] << 8 | line[3];
-      switch(tag)
-        {
-       case 'P' << 16 | 'k' << 8 | 'g':
-         if (s)
-           finish_solvable(pool, data, s, filelist, nfilelist);
-         nfilelist = 0;
-         if (split(line + 5, sp, 5) != 4)
-           break;
-         s = pool_id2solvable(pool, repo_add_solvable(repo));
-         s->name = pool_str2id(pool, sp[0], 1);
-         /* join back version and release */
-         if (sp[2] && !(sp[2][0] == '-' && !sp[2][1]))
-           sp[2][-1] = '-';
-         s->evr = makeevr(pool, sp[1]);
-         s->arch = pool_str2id(pool, sp[3], 1);
-         break;
-       case 'S' << 16 | 'u' << 8 | 'm':
-         repodata_set_str(data, s - pool->solvables, SOLVABLE_SUMMARY, line + 6);
-         break;
-       case 'V' << 16 | 'n' << 8 | 'd':
-         s->vendor = pool_str2id(pool, line + 6, 1);
-         break;
-       case 'T' << 16 | 'i' << 8 | 'm':
-         t = atoi(line + 6);
-         if (t)
-           repodata_set_num(data, s - pool->solvables, SOLVABLE_BUILDTIME, t);
-         break;
-       case 'R' << 16 | 'e' << 8 | 'q':
-         s->requires = adddep(repo, s->requires, line + 6, -SOLVABLE_PREREQMARKER);
-         break;
-       case 'P' << 16 | 'r' << 8 | 'q':
-         s->requires = adddep(repo, s->requires, line + 6, SOLVABLE_PREREQMARKER);
-         break;
-       case 'P' << 16 | 'r' << 8 | 'v':
-         if (line[6] == '/')
-           {
-             int l = strlen(line + 6) + 1;
-             if (nfilelist + l > afilelist)
-               {
-                 afilelist = nfilelist + l + 512;
-                 filelist = solv_realloc(filelist, afilelist);
-               }
-             memcpy(filelist + nfilelist, line + 6, l);
-             nfilelist += l;
-             break;
-           }
-         if (nfilelist)
-           {
-             int l;
-             for (l = 0; l < nfilelist; l += strlen(filelist + l) + 1)
-                s->provides = repo_addid_dep(repo, s->provides, pool_str2id(pool, filelist + l, 1), 0);
-              nfilelist = 0;
-           }
-         s->provides = adddep(repo, s->provides, line + 6, 0);
-         break;
-       case 'O' << 16 | 'b' << 8 | 's':
-         s->obsoletes = adddep(repo, s->obsoletes, line + 6, 0);
-         break;
-       case 'C' << 16 | 'o' << 8 | 'n':
-         s->conflicts = adddep(repo, s->conflicts, line + 6, 0);
-         break;
-       case 'R' << 16 | 'e' << 8 | 'c':
-         s->recommends = adddep(repo, s->recommends, line + 6, 0);
-         break;
-       case 'S' << 16 | 'u' << 8 | 'p':
-         s->supplements = adddep(repo, s->supplements, line + 6, 0);
-         break;
-       case 'S' << 16 | 'u' << 8 | 'g':
-         s->suggests = adddep(repo, s->suggests, line + 6, 0);
-         break;
-       case 'E' << 16 | 'n' << 8 | 'h':
-         s->enhances = adddep(repo, s->enhances, line + 6, 0);
-         break;
-        default:
-         break;
-        }
     }
-  if (s)
-    finish_solvable(pool, data, s, filelist, nfilelist);
-  solv_free(line);
-  solv_free(filelist);
-  repodata_free_dircache(data);
-  if (!(flags & REPO_NO_INTERNALIZE))
-    repodata_internalize(data);
-  return 0;
+  if (npieces < 4)
+    return pool_error(pool, -1, "selstr2job: no selection flags");
+  selflags = str2selflags(pool, pieces[npieces - 1]);
+  /* re-join pieces */
+  for (sp = pieces[2]; sp < pieces[npieces - 2]; sp++)
+    if (*sp == 0)
+      *sp = ' ';
+  queue_init(&sel);
+  if (selflags & (SELECTION_ADD | SELECTION_SUBTRACT | SELECTION_FILTER))
+    {
+      for (i = 0; i < jobqueue->count; i += 2)
+       queue_push2(&sel, jobqueue->elements[i] & (SOLVER_SELECTMASK | SOLVER_SETMASK), jobqueue->elements[i + 1]);
+      queue_empty(jobqueue);
+    }
+  if (!type)
+    r = selection_make(pool, &sel, pieces[2], selflags);
+  else if (type == SELECTIONJOB_MATCHDEPS)
+    r = selection_make_matchdeps(pool, &sel, pieces[2], selflags, keyname, 0);
+  else if (type == SELECTIONJOB_MATCHDEPID)
+    r = selection_make_matchdepid(pool, &sel, testcase_str2dep(pool, pieces[2]), selflags, keyname, 0);
+  else if (type == SELECTIONJOB_MATCHSOLVABLE)
+    r = selection_make_matchsolvable(pool, &sel, testcase_str2solvid(pool, pieces[2]), selflags, keyname, 0);
+  for (i = 0; i < sel.count; i += 2)
+    queue_push2(jobqueue, job | sel.elements[i], sel.elements[i + 1]);
+  queue_free(&sel);
+  return r;
 }
 
 const char *
@@ -1226,10 +945,7 @@ testcase_setpoolflags(Pool *pool, const char *str)
        if (!strncmp(poolflags2str[i].str, s, p - s) && poolflags2str[i].str[p - s] == 0)
          break;
       if (!poolflags2str[i].str)
-       {
-         pool_debug(pool, SOLV_ERROR, "setpoolflags: unknown flag '%.*s'\n", (int)(p - s), s);
-         return 0;
-       }
+        return pool_error(pool, 0, "setpoolflags: unknown flag '%.*s'", (int)(p - s), s);
       pool_set_flag(pool, poolflags2str[i].flag, v);
     }
   return 1;
@@ -1283,11 +999,9 @@ testcase_setsolverflags(Solver *solv, const char *str)
        if (!strncmp(solverflags2str[i].str, s, p - s) && solverflags2str[i].str[p - s] == 0)
          break;
       if (!solverflags2str[i].str)
-       {
-         pool_debug(solv->pool, SOLV_ERROR, "setsolverflags: unknown flag '%.*s'\n", (int)(p - s), s);
-         return 0;
-       }
-      solver_set_flag(solv, solverflags2str[i].flag, v);
+       return pool_error(solv->pool, 0, "setsolverflags: unknown flag '%.*s'", (int)(p - s), s);
+      if (solver_set_flag(solv, solverflags2str[i].flag, v) == -1)
+        return pool_error(solv->pool, 0, "setsolverflags: unsupported flag '%s'", solverflags2str[i].str);
     }
   return 1;
 }
@@ -1306,7 +1020,7 @@ testcase_ruleid(Solver *solv, Id rid)
   Strqueue sq;
   Queue q;
   int i;
-  void *chk;
+  Chksum *chk;
   const unsigned char *md5;
   int md5l;
   const char *s;
@@ -1339,7 +1053,7 @@ testcase_problemid(Solver *solv, Id problem)
 {
   Strqueue sq;
   Queue q;
-  void *chk;
+  Chksum *chk;
   const unsigned char *md5;
   int i, md5l;
   const char *s;
@@ -1366,7 +1080,7 @@ static const char *
 testcase_solutionid(Solver *solv, Id problem, Id solution)
 {
   Id intid;
-  void *chk;
+  Chksum *chk;
   const unsigned char *md5;
   int md5l;
   const char *s;
@@ -1391,6 +1105,33 @@ testcase_solutionid(Solver *solv, Id problem, Id solution)
   return s;
 }
 
+static const char *
+testcase_alternativeid(Solver *solv, int type, Id id, Id from)
+{
+  const char *s;
+  Pool *pool = solv->pool;
+  Chksum *chk;
+  const unsigned char *md5;
+  int md5l;
+  chk = solv_chksum_create(REPOKEY_TYPE_MD5);
+  if (type == SOLVER_ALTERNATIVE_TYPE_RECOMMENDS)
+    {
+      s = testcase_solvid2str(pool, from);
+      solv_chksum_add(chk, s, strlen(s) + 1);
+      s = testcase_dep2str(pool, id);
+      solv_chksum_add(chk, s, strlen(s) + 1);
+    }
+  else if (type == SOLVER_ALTERNATIVE_TYPE_RULE)
+    {
+      s = testcase_ruleid(solv, id);
+      solv_chksum_add(chk, s, strlen(s) + 1);
+    }
+  md5 = solv_chksum_get(chk, &md5l);
+  s = pool_bin2hex(pool, md5, 4);
+  chk = solv_chksum_free(chk, 0);
+  return s;
+}
+
 static struct class2str {
   Id class;
   const char *str;
@@ -1407,6 +1148,91 @@ static struct class2str {
   { 0, 0 }
 };
 
+static struct reason2str {
+  Id reason;
+  const char *str;
+} reason2str[] = {
+  { SOLVER_REASON_UNRELATED,           "unrelated" },
+  { SOLVER_REASON_UNIT_RULE,           "unit" },
+  { SOLVER_REASON_KEEP_INSTALLED,      "keep" },
+  { SOLVER_REASON_RESOLVE_JOB,         "job" },
+  { SOLVER_REASON_UPDATE_INSTALLED,    "update" },
+  { SOLVER_REASON_CLEANDEPS_ERASE,     "cleandeps" },
+  { SOLVER_REASON_RESOLVE,             "resolve" },
+  { SOLVER_REASON_WEAKDEP,             "weakdep" },
+  { SOLVER_REASON_RESOLVE_ORPHAN,      "orphan" },
+
+  { SOLVER_REASON_RECOMMENDED,         "recommended" },
+  { SOLVER_REASON_SUPPLEMENTED,                "supplemented" },
+  { 0, 0 }
+};
+
+static const char *
+testcase_reason2str(Id reason)
+{
+  int i;
+  for (i = 0; reason2str[i].str; i++)
+    if (reason == reason2str[i].reason)
+      return reason2str[i].str;
+  return "?";
+}
+
+static struct rclass2str {
+  Id rclass;
+  const char *str;
+} rclass2str[] = {
+  { SOLVER_RULE_PKG, "pkg" },
+  { SOLVER_RULE_UPDATE, "update" },
+  { SOLVER_RULE_FEATURE, "feature" },
+  { SOLVER_RULE_JOB, "job" },
+  { SOLVER_RULE_DISTUPGRADE, "distupgrade" },
+  { SOLVER_RULE_INFARCH, "infarch" },
+  { SOLVER_RULE_CHOICE, "choice" },
+  { SOLVER_RULE_LEARNT, "learnt" },
+  { SOLVER_RULE_BEST, "best" },
+  { SOLVER_RULE_YUMOBS, "yumobs" },
+  { SOLVER_RULE_BLACK, "black" },
+  { SOLVER_RULE_RECOMMENDS, "recommends" },
+  { 0, 0 }
+};
+
+static const char *
+testcase_rclass2str(Id rclass)
+{
+  int i;
+  for (i = 0; rclass2str[i].str; i++)
+    if (rclass == rclass2str[i].rclass)
+      return rclass2str[i].str;
+  return "unknown";
+}
+
+static int
+dump_genid(Pool *pool, Strqueue *sq, Id id, int cnt)
+{
+  struct oplist *op;
+  char cntbuf[20];
+  const char *s;
+
+  if (ISRELDEP(id))
+    {
+      Reldep *rd = GETRELDEP(pool, id);
+      for (op = oplist; op->flags; op++)
+       if (rd->flags == op->flags)
+         break;
+      cnt = dump_genid(pool, sq, rd->name, cnt);
+      cnt = dump_genid(pool, sq, rd->evr, cnt);
+      sprintf(cntbuf, "genid %2d: genid ", cnt++);
+      s = pool_tmpjoin(pool, cntbuf, "op ", op->flags ? op->opname : "unknown");
+    }
+  else
+    {
+      sprintf(cntbuf, "genid %2d: genid ", cnt++);
+      s = pool_tmpjoin(pool, cntbuf, id ? "lit " : "null", id ? pool_id2str(pool, id) : 0);
+    }
+  strqueue_push(sq, s);
+  return cnt;
+}
+
 char *
 testcase_solverresult(Solver *solv, int resultflags)
 {
@@ -1526,18 +1352,228 @@ testcase_solverresult(Solver *solv, int resultflags)
 
   if ((resultflags & TESTCASE_RESULT_UNNEEDED) != 0)
     {
-      Queue q;
+      Queue q, qf;
 
       queue_init(&q);
+      queue_init(&qf);
       solver_get_unneeded(solv, &q, 0);
+      solver_get_unneeded(solv, &qf, 1);
+      for (i = j = 0; i < q.count; i++)
+       {
+         /* we rely on qf containing a subset of q in the same order */
+         if (j < qf.count && q.elements[i] == qf.elements[j])
+           {
+             s = pool_tmpjoin(pool, "unneeded_filtered ", testcase_solvid2str(pool, q.elements[i]), 0);
+             j++;
+           }
+         else
+           s = pool_tmpjoin(pool, "unneeded ", testcase_solvid2str(pool, q.elements[i]), 0);
+         strqueue_push(&sq, s);
+       }
+      queue_free(&q);
+      queue_free(&qf);
+    }
+  if ((resultflags & TESTCASE_RESULT_USERINSTALLED) != 0)
+    {
+      Queue q;
+      solver_get_userinstalled(solv, &q, 0);
+      for (i = 0; i < q.count; i++)
+       {
+         s = pool_tmpjoin(pool, "userinstalled pkg ", testcase_solvid2str(pool, q.elements[i]), 0);
+         strqueue_push(&sq, s);
+       }
+      queue_empty(&q);
+      solver_get_userinstalled(solv, &q, GET_USERINSTALLED_NAMES | GET_USERINSTALLED_INVERTED);
       for (i = 0; i < q.count; i++)
        {
-         s = pool_tmpjoin(pool, "unneeded ", testcase_solvid2str(pool, q.elements[i]), 0);
+         s = pool_tmpjoin(pool, "autoinst name ", pool_id2str(pool, q.elements[i]), 0);
          strqueue_push(&sq, s);
        }
       queue_free(&q);
     }
+  if ((resultflags & TESTCASE_RESULT_ALTERNATIVES) != 0)
+    {
+      char *altprefix;
+      Queue q, rq;
+      int cnt;
+      Id alternative;
+      queue_init(&q);
+      queue_init(&rq);
+      cnt = solver_alternatives_count(solv);
+      for (alternative = 1; alternative <= cnt; alternative++)
+       {
+         Id id, from, chosen;
+         char num[20];
+         int type = solver_get_alternative(solv, alternative, &id, &from, &chosen, &q, 0);
+         altprefix = solv_dupjoin("alternative ", testcase_alternativeid(solv, type, id, from), " ");
+         strcpy(num, " 0 ");
+         if (type == SOLVER_ALTERNATIVE_TYPE_RECOMMENDS)
+           {
+             char *s = pool_tmpjoin(pool, altprefix, num, testcase_solvid2str(pool, from));
+             s = pool_tmpappend(pool, s, " recommends ", testcase_dep2str(pool, id));
+             strqueue_push(&sq, s);
+           }
+         else if (type == SOLVER_ALTERNATIVE_TYPE_RULE)
+           {
+             /* map choice rules back to pkg rules */
+             if (solver_ruleclass(solv, id) == SOLVER_RULE_CHOICE)
+               id = solver_rule2pkgrule(solv, id);
+             if (solver_ruleclass(solv, id) == SOLVER_RULE_RECOMMENDS)
+               id = solver_rule2pkgrule(solv, id);
+             solver_allruleinfos(solv, id, &rq);
+             for (i = 0; i < rq.count; i += 4)
+               {
+                 int rtype = rq.elements[i];
+                 if ((rtype & SOLVER_RULE_TYPEMASK) == SOLVER_RULE_JOB)
+                   {
+                     const char *js = testcase_job2str(pool, rq.elements[i + 2], rq.elements[i + 3]);
+                     char *s = pool_tmpjoin(pool, altprefix, num, "job ");
+                     s = pool_tmpappend(pool, s, js, 0);
+                     strqueue_push(&sq, s);
+                   }
+                 else if (rtype == SOLVER_RULE_PKG_REQUIRES)
+                   {
+                     char *s = pool_tmpjoin(pool, altprefix, num, testcase_solvid2str(pool, rq.elements[i + 1]));
+                     s = pool_tmpappend(pool, s, " requires ", testcase_dep2str(pool, rq.elements[i + 3]));
+                     strqueue_push(&sq, s);
+                   }
+                 else if (rtype == SOLVER_RULE_UPDATE || rtype == SOLVER_RULE_FEATURE)
+                   {
+                     const char *js = testcase_solvid2str(pool, rq.elements[i + 1]);
+                     char *s = pool_tmpjoin(pool, altprefix, num, "update ");
+                     s = pool_tmpappend(pool, s, js, 0);
+                     strqueue_push(&sq, s);
+                   }
+               }
+           }
+         for (i = 0; i < q.count; i++)
+           {
+             Id p = q.elements[i];
+             if (i >= 9)
+               num[0] = '0' + (i + 1) / 10;
+             num[1] = '0' + (i + 1) % 10;
+             if (-p == chosen)
+               s = pool_tmpjoin(pool, altprefix, num, "+ ");
+             else if (p < 0)
+               s = pool_tmpjoin(pool, altprefix, num, "- ");
+             else if (p >= 0)
+               s = pool_tmpjoin(pool, altprefix, num, "  ");
+             s = pool_tmpappend(pool, s,  testcase_solvid2str(pool, p < 0 ? -p : p), 0);
+             strqueue_push(&sq, s);
+           }
+         solv_free(altprefix);
+       }
+      queue_free(&q);
+      queue_free(&rq);
+    }
+  if ((resultflags & TESTCASE_RESULT_RULES) != 0)
+    {
+      /* dump all rules */
+      Id rid;
+      SolverRuleinfo rclass;
+      Queue q;
+      int i;
+
+      queue_init(&q);
+      for (rid = 1; (rclass = solver_ruleclass(solv, rid)) != SOLVER_RULE_UNKNOWN; rid++)
+       {
+         char *prefix = solv_dupjoin("rule ", testcase_rclass2str(rclass), " ");
+         prefix = solv_dupappend(prefix, testcase_ruleid(solv, rid), 0);
+         solver_ruleliterals(solv, rid, &q);
+         if (rclass == SOLVER_RULE_FEATURE && q.count == 1 && q.elements[0] == -SYSTEMSOLVABLE)
+           continue;
+         for (i = 0; i < q.count; i++)
+           {
+             Id p = q.elements[i];
+             const char *s;
+             if (p < 0)
+               s = pool_tmpjoin(pool, prefix, " -", testcase_solvid2str(pool, -p));
+             else
+               s = pool_tmpjoin(pool, prefix, "  ", testcase_solvid2str(pool, p));
+             strqueue_push(&sq, s);
+           }
+         solv_free(prefix);
+       }
+      queue_free(&q);
+    }
+  if ((resultflags & TESTCASE_RESULT_GENID) != 0)
+    {
+      for (i = 0 ; i < solv->job.count; i += 2)
+       {
+         Id id, id2;
+         if (solv->job.elements[i] != (SOLVER_NOOP | SOLVER_SOLVABLE_PROVIDES))
+           continue;
+         id = solv->job.elements[i + 1];
+         s = testcase_dep2str(pool, id);
+         strqueue_push(&sq, pool_tmpjoin(pool, "genid dep ", s, 0));
+         if ((id2 = testcase_str2dep(pool, s)) != id)
+           {
+             s = pool_tmpjoin(pool, "genid roundtrip error: ", testcase_dep2str(pool, id2), 0);
+             strqueue_push(&sq, s);
+           }
+         dump_genid(pool, &sq, id, 1);
+       }
+    }
+  if ((resultflags & TESTCASE_RESULT_REASON) != 0)
+    {
+      Queue whyq;
+      queue_init(&whyq);
+      FOR_POOL_SOLVABLES(p)
+       {
+         Id info, p2, id;
+          int reason = solver_describe_decision(solv, p, &info);
+         if (reason == SOLVER_REASON_UNRELATED)
+           continue;
+         if (reason == SOLVER_REASON_WEAKDEP)
+           {
+             solver_describe_weakdep_decision(solv, p, &whyq);
+             if (whyq.count)
+               {
+                 for (i = 0; i < whyq.count; i += 3)
+                   {
+                     reason = whyq.elements[i];
+                     p2 = whyq.elements[i + 1];
+                     id = whyq.elements[i + 2];
+                     s = pool_tmpjoin(pool, "reason ", testcase_solvid2str(pool, p), 0);
+                     s = pool_tmpappend(pool, s, " ", testcase_reason2str(reason));
+                     s = pool_tmpappend(pool, s, " ", testcase_dep2str(pool, id));
+                     if (p2)
+                       s = pool_tmpappend(pool, s, " ", testcase_solvid2str(pool, p2));
+                     strqueue_push(&sq, s);
+                   }
+                 continue;
+               }
+           }
+         s = pool_tmpjoin(pool, "reason ", testcase_solvid2str(pool, p), 0);
+         s = pool_tmpappend(pool, s, " ", testcase_reason2str(reason));
+         if (info)
+           s = pool_tmpappend(pool, s, " ", testcase_ruleid(solv, info));
+         strqueue_push(&sq, s);
+       }
+      queue_free(&whyq);
+    }
+  if ((resultflags & TESTCASE_RESULT_CLEANDEPS) != 0)
+    {
+      Queue q;
 
+      queue_init(&q);
+      solver_get_cleandeps(solv, &q);
+      for (i = 0; i < q.count; i++)
+       {
+         s = pool_tmpjoin(pool, "cleandeps ", testcase_solvid2str(pool, q.elements[i]), 0);
+         strqueue_push(&sq, s);
+       }
+      queue_free(&q);
+    }
+  if ((resultflags & TESTCASE_RESULT_JOBS) != 0)
+    {
+      for (i = 0; i < solv->job.count; i += 2)
+       {
+         s = (char *)testcase_job2str(pool, solv->job.elements[i], solv->job.elements[i + 1]);
+         s = pool_tmpjoin(pool, "job ", s, 0);
+         strqueue_push(&sq, s);
+       }
+    }
   strqueue_sort(&sq);
   result = strqueue_join(&sq);
   strqueue_free(&sq);
@@ -1545,8 +1581,8 @@ testcase_solverresult(Solver *solv, int resultflags)
 }
 
 
-int
-testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasename, const char *resultname)
+static int
+testcase_write_mangled(Solver *solv, const char *dir, int resultflags, const char *testcasename, const char *resultname)
 {
   Pool *pool = solv->pool;
   Repo *repo;
@@ -1555,7 +1591,7 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
   Id lowscore;
   FILE *fp;
   Strqueue sq;
-  char *cmd, *out;
+  char *cmd, *out, *result;
   const char *s;
 
   if (!testcasename)
@@ -1563,11 +1599,12 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
   if (!resultname)
     resultname = "solver.result";
 
+#ifdef _WIN32
+  if (mkdir(dir) && errno != EEXIST)
+#else
   if (mkdir(dir, 0777) && errno != EEXIST)
-    {
-      pool_debug(solv->pool, SOLV_ERROR, "testcase_write: could not create directory '%s'\n", dir);
-      return 0;
-    }
+#endif
+    return pool_error(solv->pool, 0, "testcase_write: could not create directory '%s'", dir);
   strqueue_init(&sq);
   FOR_REPOS(repoid, repo)
     {
@@ -1577,7 +1614,14 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
        sprintf(priobuf, "%d.%d", repo->priority, repo->subpriority);
       else
        sprintf(priobuf, "%d", repo->priority);
+#if !defined(WITHOUT_COOKIEOPEN) && defined(ENABLE_ZLIB_COMPRESSION)
       out = pool_tmpjoin(pool, name, ".repo", ".gz");
+#else
+      out = pool_tmpjoin(pool, name, ".repo", 0);
+#endif
+      for (i = 0; out[i]; i++)
+       if (out[i] == '/')
+         out[i] = '_';
       cmd = pool_tmpjoin(pool, "repo ", name, " ");
       cmd = pool_tmpappend(pool, cmd, priobuf, " ");
       cmd = pool_tmpappend(pool, cmd, "testtags ", out);
@@ -1585,14 +1629,14 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
       out = pool_tmpjoin(pool, dir, "/", out);
       if (!(fp = solv_xfopen(out, "w")))
        {
-         pool_debug(solv->pool, SOLV_ERROR, "testcase_write: could not open '%s' for writing\n", out);
+         pool_error(solv->pool, 0, "testcase_write: could not open '%s' for writing", out);
          strqueue_free(&sq);
          return 0;
        }
       testcase_write_testtags(repo, fp);
       if (fclose(fp))
        {
-         pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
+         pool_error(solv->pool, 0, "testcase_write: write error");
          strqueue_free(&sq);
          return 0;
        }
@@ -1610,7 +1654,7 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
          lowscore = pool->id2arch[i];
        }
     }
-  cmd = pool_tmpjoin(pool, "system ", pool->lastarch ? pool_id2str(pool, arch) : "unset", 0);
+  cmd = pool_tmpjoin(pool, "system ", pool->lastarch ? pool_id2str(pool, arch) : "-", 0);
   for (i = 0; disttype2str[i].str != 0; i++)
     if (pool->disttype == disttype2str[i].type)
       break;
@@ -1640,6 +1684,18 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
        }
     }
 
+  /* dump disabled packages (must come before the namespace/job lines) */
+  if (pool->considered)
+    {
+      Id p;
+      FOR_POOL_SOLVABLES(p)
+       if (!MAPTST(pool->considered, p))
+         {
+           cmd = pool_tmpjoin(pool, "disable pkg ", testcase_solvid2str(pool, p), 0);
+           strqueue_push(&sq, cmd);
+         }
+    }
+
   s = testcase_getsolverflags(solv);
   if (*s)
     {
@@ -1676,9 +1732,8 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
       strqueue_push(&sq, cmd);
     }
 
-  if (resultflags)
+  if ((resultflags & ~TESTCASE_RESULT_REUSE_SOLVER) != 0)
     {
-      char *result;
       cmd = 0;
       for (i = 0; resultflags2str[i].str; i++)
        if ((resultflags & resultflags2str[i].flag) != 0)
@@ -1689,7 +1744,6 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
       result = testcase_solverresult(solv, resultflags);
       if (!strcmp(resultname, "<inline>"))
        {
-         int i;
          Strqueue rsq;
          strqueue_init(&rsq);
          strqueue_split(&rsq, result);
@@ -1705,21 +1759,23 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
          out = pool_tmpjoin(pool, dir, "/", resultname);
          if (!(fp = fopen(out, "w")))
            {
-             pool_debug(solv->pool, SOLV_ERROR, "testcase_write: could not open '%s' for writing\n", out);
+             pool_error(solv->pool, 0, "testcase_write: could not open '%s' for writing", out);
              solv_free(result);
              strqueue_free(&sq);
              return 0;
            }
          if (result && *result && fwrite(result, strlen(result), 1, fp) != 1)
            {
-             pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
+             pool_error(solv->pool, 0, "testcase_write: write error");
              solv_free(result);
              strqueue_free(&sq);
+             fclose(fp);
              return 0;
            }
          if (fclose(fp))
            {
-             pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
+             pool_error(solv->pool, 0, "testcase_write: write error");
+             solv_free(result);
              strqueue_free(&sq);
              return 0;
            }
@@ -1727,38 +1783,85 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
       solv_free(result);
     }
 
-  cmd = strqueue_join(&sq);
+  result = strqueue_join(&sq);
+  strqueue_free(&sq);
   out = pool_tmpjoin(pool, dir, "/", testcasename);
   if (!(fp = fopen(out, "w")))
     {
-      pool_debug(solv->pool, SOLV_ERROR, "testcase_write: could not open '%s' for writing\n", out);
-      strqueue_free(&sq);
+      pool_error(solv->pool, 0, "testcase_write: could not open '%s' for writing", out);
+      solv_free(result);
       return 0;
     }
-  if (*cmd && fwrite(cmd, strlen(cmd), 1, fp) != 1)
+  if (*result && fwrite(result, strlen(result), 1, fp) != 1)
     {
-      pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
-      strqueue_free(&sq);
+      pool_error(solv->pool, 0, "testcase_write: write error");
+      solv_free(result);
+      fclose(fp);
       return 0;
     }
   if (fclose(fp))
     {
-      pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
-      strqueue_free(&sq);
+      pool_error(solv->pool, 0, "testcase_write: write error");
+      solv_free(result);
       return 0;
     }
-  solv_free(cmd);
-  strqueue_free(&sq);
+  solv_free(result);
   return 1;
 }
 
+int
+testcase_write(Solver *solv, const char *dir, int resultflags, const char *testcasename, const char *resultname)
+{
+  Pool *pool = solv->pool;
+  int i, r, repoid;
+  int mangle = 1;
+  const char **orignames;
+
+  /* mangle repo names so that there are no conflicts */
+  orignames = solv_calloc(pool->nrepos, sizeof(char *));
+  for (repoid = 1; repoid < pool->nrepos; repoid++)
+    {
+      Repo *repo = pool_id2repo(pool, repoid);
+      char *buf = solv_malloc((repo->name ? strlen(repo->name) : 0) + 40);
+      char *mp;
+      orignames[repoid] = repo->name;
+      if (!repo->name || !repo->name[0])
+        sprintf(buf, "#%d", repoid);
+      else
+       strcpy(buf, repo->name);
+      for (i = 0; buf[i]; i++)
+       if (buf[i] == ' ' || buf[i] == '\t' || buf[i] == '/')
+         buf[i] = '_';
+      mp = buf + strlen(buf);
+      for (;;)
+       {
+         for (i = 1; i < repoid; i++)
+           if (!strcmp(buf, pool_id2repo(pool, i)->name))
+             break;
+         if (i == repoid)
+           break;
+          sprintf(mp, "_%d", mangle++);
+       }
+      repo->name = buf;
+    }
+  r = testcase_write_mangled(solv, dir, resultflags, testcasename, resultname);
+  for (repoid = 1; repoid < pool->nrepos; repoid++)
+    {
+      Repo *repo = pool_id2repo(pool, repoid);
+      solv_free((void *)repo->name);
+      repo->name = orignames[repoid];
+    }
+  solv_free(orignames);
+  return r;
+}
+
 static char *
 read_inline_file(FILE *fp, char **bufp, char **bufpp, int *buflp)
 {
   char *result = solv_malloc(1024);
   char *rp = result;
   int resultl = 1024;
-  
+
   for (;;)
     {
       size_t rl;
@@ -1813,7 +1916,7 @@ read_file(FILE *fp)
   char *result = solv_malloc(1024);
   char *rp = result;
   int resultl = 1024;
-  
+
   for (;;)
     {
       size_t rl;
@@ -1851,14 +1954,14 @@ str2resultflags(Pool *pool, char *s)    /* modifies the string! */
            break;
          }
       if (!resultflags2str[i].str)
-       pool_debug(pool, SOLV_ERROR, "result: unknown flag '%s'\n", s);
+       pool_error(pool, 0, "result: unknown flag '%s'", s);
       s = se;
     }
   return resultflags;
 }
 
 Solver *
-testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp, int *resultflagsp)
+testcase_read(Pool *pool, FILE *fp, const char *testcase, Queue *job, char **resultp, int *resultflagsp)
 {
   Solver *solv;
   char *buf, *bufp;
@@ -1870,14 +1973,28 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
   int prepared = 0;
   int closefp = !fp;
   int poolflagsreset = 0;
-
+  int missing_features = 0;
+  Id *genid = 0;
+  int ngenid = 0;
+  Queue autoinstq;
+
+  if (resultp)
+    *resultp = 0;
+  if (resultflagsp)
+    *resultflagsp = 0;
   if (!fp && !(fp = fopen(testcase, "r")))
     {
-      pool_debug(pool, SOLV_ERROR, "testcase_read: could not open '%s'\n", testcase);
+      pool_error(pool, 0, "testcase_read: could not open '%s'", testcase);
       return 0;
     }
   testcasedir = solv_strdup(testcase);
-  if ((s = strrchr(testcasedir, '/')) != 0)
+  s = strrchr(testcasedir, '/');
+#ifdef _WIN32
+  buf = strrchr(testcasedir, '\\');
+  if (!s || (buf && buf > s))
+    s = buf;
+#endif
+  if (s)
     s[1] = 0;
   else
     *testcasedir = 0;
@@ -1885,6 +2002,7 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
   buf = solv_malloc(bufl);
   bufp = buf;
   solv = 0;
+  queue_init(&autoinstq);
   for (;;)
     {
       if (bufp - buf + 16 > bufl)
@@ -1962,7 +2080,7 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
                }
              if (!rfp)
                {
-                 pool_debug(pool, SOLV_ERROR, "testcase_read: could not open '%s'\n", rdata);
+                 pool_error(pool, 0, "testcase_read: could not open '%s'", rdata);
                }
              else if (!strcmp(repotype, "testtags"))
                {
@@ -1974,7 +2092,7 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
                  repo_add_solv(repo, rfp, 0);
                  fclose(rfp);
                }
-#if 0
+#if ENABLE_TESTCASE_HELIXREPO
              else if (!strcmp(repotype, "helix"))
                {
                  repo_add_helix(repo, rfp, 0);
@@ -1984,37 +2102,57 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
              else
                {
                  fclose(rfp);
-                 pool_debug(pool, SOLV_ERROR, "testcase_read: unknown repo type for repo '%s'\n", repo->name);
+                 pool_error(pool, 0, "testcase_read: unknown repo type for repo '%s'", repo->name);
                }
            }
        }
       else if (!strcmp(pieces[0], "system") && npieces >= 3)
        {
          int i;
-         prepared = 0;
+
          /* must set the disttype before the arch */
-         for (i = 0; disttype2str[i].str != 0; i++)
-           if (!strcmp(disttype2str[i].str, pieces[2]))
-             break;
-         if (!disttype2str[i].str)
-           pool_debug(pool, SOLV_ERROR, "testcase_read: system: unknown disttype '%s'\n", pieces[2]);
-         else if (pool->disttype != disttype2str[i].type)
+         prepared = 0;
+         if (strcmp(pieces[2], "*") != 0)
            {
+             char *dp = pieces[2];
+             while (dp && *dp)
+               {
+                 char *dpe = strchr(dp, ',');
+                 if (dpe)
+                   *dpe = 0;
+                 for (i = 0; disttype2str[i].str != 0; i++)
+                   if (!strcmp(disttype2str[i].str, dp))
+                     break;
+                 if (dpe)
+                   *dpe++ = ',';
+                 if (disttype2str[i].str)
+                   {
 #ifdef MULTI_SEMANTICS
-             pool_setdisttype(pool, disttype2str[i].type);
-#else
-             pool_debug(pool, SOLV_ERROR, "testcase_read: system: cannot change disttype to '%s'\n", pieces[2]);
+                     if (pool->disttype != disttype2str[i].type)
+                       pool_setdisttype(pool, disttype2str[i].type);
 #endif
+                     if (pool->disttype == disttype2str[i].type)
+                       break;
+                   }
+                 dp = dpe;
+               }
+             if (!(dp && *dp))
+               {
+                 pool_error(pool, 0, "testcase_read: system: could not change disttype to '%s'", pieces[2]);
+                 missing_features = 1;
+               }
            }
-         if (strcmp(pieces[1], "unset") != 0)
-           pool_setarch(pool, pieces[1]);
-         else
+         if (strcmp(pieces[1], "unset") == 0 || strcmp(pieces[1], "-") == 0)
            pool_setarch(pool, 0);
+         else if (pieces[1][0] == ':')
+           pool_setarchpolicy(pool, pieces[1] + 1);
+         else
+           pool_setarch(pool, pieces[1]);
          if (npieces > 3)
            {
              Repo *repo = testcase_str2repo(pool, pieces[3]);
              if (!repo)
-               pool_debug(pool, SOLV_ERROR, "testcase_read: system: unknown repo '%s'\n", pieces[3]);
+               pool_error(pool, 0, "testcase_read: system: unknown repo '%s'", pieces[3]);
              else
                pool_set_installed(pool, repo);
            }
@@ -2023,7 +2161,7 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
        {
          char *sp;
          Id how, what;
-         if (!prepared)
+         if (prepared <= 0)
            {
              pool_addfileprovides(pool);
              pool_createwhatprovides(pool);
@@ -2031,7 +2169,25 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
            }
          if (npieces >= 3 && !strcmp(pieces[2], "selection"))
            {
-             addselectionjob(pool, pieces + 1, npieces - 1, job);
+             addselectionjob(pool, pieces + 1, npieces - 1, job, 0, 0);
+             continue;
+           }
+         if (npieces >= 4 && !strcmp(pieces[2], "selection_matchdeps"))
+           {
+             pieces[2] = pieces[1];
+             addselectionjob(pool, pieces + 2, npieces - 2, job, SELECTIONJOB_MATCHDEPS, pool_str2id(pool, pieces[3], 1));
+             continue;
+           }
+         if (npieces >= 4 && !strcmp(pieces[2], "selection_matchdepid"))
+           {
+             pieces[2] = pieces[1];
+             addselectionjob(pool, pieces + 2, npieces - 2, job, SELECTIONJOB_MATCHDEPID, pool_str2id(pool, pieces[3], 1));
+             continue;
+           }
+         if (npieces >= 4 && !strcmp(pieces[2], "selection_matchsolvable"))
+           {
+             pieces[2] = pieces[1];
+             addselectionjob(pool, pieces + 2, npieces - 2, job, SELECTIONJOB_MATCHSOLVABLE, pool_str2id(pool, pieces[3], 1));
              continue;
            }
          /* rejoin */
@@ -2050,9 +2206,9 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
        {
          int i = strlen(pieces[1]);
          s = strchr(pieces[1], '(');
-         if (!s && pieces[1][i - 1] != ')')
+         if (!s || pieces[1][i - 1] != ')')
            {
-             pool_debug(pool, SOLV_ERROR, "testcase_read: bad namespace '%s'\n", pieces[1]);
+             pool_error(pool, 0, "testcase_read: bad namespace '%s'", pieces[1]);
            }
          else
            {
@@ -2069,7 +2225,7 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
              for (i = 2; i < npieces; i++)
                queue_push(&q, testcase_str2solvid(pool, pieces[i]));
              /* now do the callback */
-             if (!prepared)
+             if (prepared <= 0)
                {
                  pool_addfileprovides(pool);
                  pool_createwhatprovides(pool);
@@ -2101,22 +2257,26 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
          for (i = 1; i < npieces; i++)
            testcase_setsolverflags(solv, pieces[i]);
         }
-      else if (!strcmp(pieces[0], "result") && npieces > 2)
+      else if (!strcmp(pieces[0], "result") && npieces > 1)
        {
          char *result = 0;
          int resultflags = str2resultflags(pool, pieces[1]);
-         const char *rdata = pool_tmpjoin(pool, testcasedir, pieces[2], 0);
-         if (!strcmp(pieces[2], "<inline>"))
-           result = read_inline_file(fp, &buf, &bufp, &bufl);
-         else
+         const char *rdata;
+         if (npieces > 2)
            {
-              FILE *rfp = fopen(rdata, "r");
-             if (!rfp)
-               pool_debug(pool, SOLV_ERROR, "testcase_read: could not open '%s'\n", rdata);
+             rdata = pool_tmpjoin(pool, testcasedir, pieces[2], 0);
+             if (!strcmp(pieces[2], "<inline>"))
+               result = read_inline_file(fp, &buf, &bufp, &bufl);
              else
                {
-                 result = read_file(rfp);
-                 fclose(rfp);
+                 FILE *rfp = fopen(rdata, "r");
+                 if (!rfp)
+                   pool_error(pool, 0, "testcase_read: could not open '%s'", rdata);
+                 else
+                   {
+                     result = read_file(rfp);
+                     fclose(rfp);
+                   }
                }
            }
          if (resultp)
@@ -2126,15 +2286,128 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
          if (resultflagsp)
            *resultflagsp = resultflags;
        }
-      else if (!strcmp(pieces[0], "nextjob") && npieces == 1)
+      else if (!strcmp(pieces[0], "nextjob"))
        {
+         if (npieces == 2 && resultflagsp && !strcmp(pieces[1], "reusesolver"))
+           *resultflagsp |= TESTCASE_RESULT_REUSE_SOLVER;
          break;
        }
+      else if (!strcmp(pieces[0], "disable") && npieces == 3)
+       {
+         Id p, pp, jobsel, what = 0;
+         if (!prepared)
+           pool_createwhatprovides(pool);
+         prepared = -1;
+         if (!pool->considered)
+           {
+             pool->considered = solv_calloc(1, sizeof(Map));
+             map_init(pool->considered, pool->nsolvables);
+             map_setall(pool->considered);
+           }
+         jobsel = testcase_str2jobsel(pool, "disable", pieces + 1, npieces - 1, &what);
+         if (jobsel < 0)
+           continue;
+         if (jobsel == SOLVER_SOLVABLE_ALL)
+           map_empty(pool->considered);
+         else if (jobsel == SOLVER_SOLVABLE_REPO)
+           {
+             Repo *repo = pool_id2repo(pool, what);
+             Solvable *s;
+             FOR_REPO_SOLVABLES(repo, p, s)
+               MAPCLR(pool->considered, p);
+           }
+         FOR_JOB_SELECT(p, pp, jobsel, what)
+           MAPCLR(pool->considered, p);
+       }
+      else if (!strcmp(pieces[0], "feature"))
+       {
+         int i, j;
+         for (i = 1; i < npieces; i++)
+           {
+             for (j = 0; features[j]; j++)
+               if (!strcmp(pieces[i], features[j]))
+                 break;
+             if (!features[j])
+               {
+                 pool_error(pool, 0, "testcase_read: missing feature '%s'", pieces[i]);
+                 missing_features++;
+               }
+           }
+         if (missing_features)
+           break;
+       }
+      else if (!strcmp(pieces[0], "genid") && npieces > 1)
+       {
+         Id id;
+         /* rejoin */
+         if (npieces > 2)
+           {
+             char *sp;
+             for (sp = pieces[2]; sp < pieces[npieces - 1]; sp++)
+               if (*sp == 0)
+                 *sp = ' ';
+           }
+         genid = solv_extend(genid, ngenid, 1, sizeof(*genid), 7);
+         if (!strcmp(pieces[1], "op") && npieces > 2)
+           {
+             struct oplist *op;
+             for (op = oplist; op->flags; op++)
+               if (!strncmp(pieces[2], op->opname, strlen(op->opname)))
+                 break;
+             if (!op->flags)
+               {
+                 pool_error(pool, 0, "testcase_read: genid: unknown op '%s'", pieces[2]);
+                 break;
+               }
+             if (ngenid < 2)
+               {
+                 pool_error(pool, 0, "testcase_read: genid: out of stack");
+                 break;
+               }
+             ngenid -= 2;
+             id = pool_rel2id(pool, genid[ngenid] , genid[ngenid + 1], op->flags, 1);
+           }
+         else if (!strcmp(pieces[1], "lit"))
+           id = pool_str2id(pool, npieces > 2 ? pieces[2] : "", 1);
+         else if (!strcmp(pieces[1], "null"))
+           id = 0;
+         else if (!strcmp(pieces[1], "dep"))
+           id = testcase_str2dep(pool, pieces[2]);
+         else
+           {
+             pool_error(pool, 0, "testcase_read: genid: unknown command '%s'", pieces[1]);
+             break;
+           }
+         genid[ngenid++] = id;
+       }
+      else if (!strcmp(pieces[0], "autoinst") && npieces > 2)
+       {
+         if (strcmp(pieces[1], "name"))
+           {
+             pool_error(pool, 0, "testcase_read: autoinst: illegal mode");
+             break;
+           }
+         queue_push(&autoinstq, pool_str2id(pool, pieces[2], 1));
+       }
+      else if (!strcmp(pieces[0], "evrcmp") && npieces == 3)
+       {
+         Id evr1 = pool_str2id(pool, pieces[1], 1);
+         Id evr2 = pool_str2id(pool, pieces[2], 1);
+         int r = pool_evrcmp(pool, evr1, evr2, EVRCMP_COMPARE);
+         r = r < 0 ? REL_LT : r > 0 ? REL_GT : REL_EQ;
+         queue_push2(job, SOLVER_NOOP | SOLVER_SOLVABLE_PROVIDES, pool_rel2id(pool, evr1, evr2, r, 1));
+       }
       else
        {
-         pool_debug(pool, SOLV_ERROR, "testcase_read: cannot parse command '%s'\n", pieces[0]);
+         pool_error(pool, 0, "testcase_read: cannot parse command '%s'", pieces[0]);
        }
     }
+  while (job && ngenid > 0)
+    queue_push2(job, SOLVER_NOOP | SOLVER_SOLVABLE_PROVIDES, genid[--ngenid]);
+  if (autoinstq.count)
+    pool_add_userinstalled_jobs(pool, &autoinstq, job, GET_USERINSTALLED_NAMES | GET_USERINSTALLED_INVERTED);
+  queue_free(&autoinstq);
+  genid = solv_free(genid);
   buf = solv_free(buf);
   pieces = solv_free(pieces);
   solv_free(testcasedir);
@@ -2150,11 +2423,18 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
     }
   if (closefp)
     fclose(fp);
+  if (missing_features)
+    {
+      solver_free(solv);
+      solv = 0;
+      if (resultflagsp)
+       *resultflagsp = 77;     /* hack for testsolv */
+    }
   return solv;
 }
 
 char *
-testcase_resultdiff(char *result1, char *result2)
+testcase_resultdiff(const char *result1, const char *result2)
 {
   Strqueue sq1, sq2, osq;
   char *r;