#include "poolarch.h"
#include "poolvendor.h"
#include "repo.h"
-#include "repo_susetags.h"
+#include "repo_solv.h"
#include "solver.h"
#include "solverdebug.h"
#include "chksum.h"
#include "testcase.h"
+#include "selection.h"
#include "solv_xfopen.h"
-#ifndef ENABLE_SUSEREPO
-# define DISABLE_JOIN2
-# include "tools_util.h"
-#else
-# include "repo_susetags.h"
-#endif
+#define DISABLE_JOIN2
+#include "tools_util.h"
static struct job2str {
Id job;
{ SOLVER_ERASE, "erase" },
{ SOLVER_UPDATE, "update" },
{ SOLVER_WEAKENDEPS, "weakendeps" },
- { SOLVER_NOOBSOLETES, "noobsoletes" },
+ { SOLVER_MULTIVERSION, "multiversion" },
+ { SOLVER_MULTIVERSION, "noobsoletes" }, /* old name */
{ SOLVER_LOCK, "lock" },
{ SOLVER_DISTUPGRADE, "distupgrade" },
{ SOLVER_VERIFY, "verify" },
{ SOLVER_WEAK, "weak" },
{ SOLVER_ESSENTIAL, "essential" },
{ SOLVER_CLEANDEPS, "cleandeps" },
+ { SOLVER_ORUPDATE, "orupdate" },
+ { SOLVER_FORCEBEST, "forcebest" },
+ { SOLVER_TARGETED, "targeted" },
+ { SOLVER_NOTBYUSER, "notbyuser" },
{ SOLVER_SETEV, "setev" },
{ SOLVER_SETEVR, "setevr" },
{ SOLVER_SETARCH, "setarch" },
{ TESTCASE_RESULT_ORPHANED, "orphaned" },
{ TESTCASE_RESULT_RECOMMENDED, "recommended" },
{ TESTCASE_RESULT_UNNEEDED, "unneeded" },
+ { TESTCASE_RESULT_ALTERNATIVES, "alternatives" },
{ 0, 0 }
};
int def;
} solverflags2str[] = {
{ SOLVER_FLAG_ALLOW_DOWNGRADE, "allowdowngrade", 0 },
+ { SOLVER_FLAG_ALLOW_NAMECHANGE, "allownamechange", 1 },
{ SOLVER_FLAG_ALLOW_ARCHCHANGE, "allowarchchange", 0 },
{ SOLVER_FLAG_ALLOW_VENDORCHANGE, "allowvendorchange", 0 },
{ SOLVER_FLAG_ALLOW_UNINSTALL, "allowuninstall", 0 },
{ SOLVER_FLAG_NO_UPDATEPROVIDE, "noupdateprovide", 0 },
{ SOLVER_FLAG_SPLITPROVIDES, "splitprovides", 0 },
{ SOLVER_FLAG_IGNORE_RECOMMENDED, "ignorerecommended", 0 },
- { SOLVER_FLAG_IGNORE_ALREADY_RECOMMENDED, "ignorealreadyrecommended", 0 },
+ { SOLVER_FLAG_ADD_ALREADY_RECOMMENDED, "addalreadyrecommended", 0 },
{ SOLVER_FLAG_NO_INFARCHCHECK, "noinfarchcheck", 0 },
+ { 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 },
+ { 0, 0, 0 }
+};
+
+static struct poolflags2str {
+ Id flag;
+ const char *str;
+ int def;
+} poolflags2str[] = {
+ { POOL_FLAG_PROMOTEEPOCH, "promoteepoch", 0 },
+ { POOL_FLAG_FORBIDSELFCONFLICTS, "forbidselfconflicts", 0 },
+ { 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 },
{ 0, 0, 0 }
};
+static struct disttype2str {
+ Id type;
+ const char *str;
+} disttype2str[] = {
+ { DISTTYPE_RPM, "rpm" },
+ { DISTTYPE_DEB, "deb" },
+ { DISTTYPE_ARCH, "arch" },
+ { DISTTYPE_HAIKU, "haiku" },
+ { 0, 0 }
+};
+
+static struct selflags2str {
+ Id flag;
+ const char *str;
+} selflags2str[] = {
+ { SELECTION_NAME, "name" },
+ { SELECTION_PROVIDES, "provides" },
+ { SELECTION_FILELIST, "filelist" },
+ { SELECTION_CANON, "canon" },
+ { SELECTION_DOTARCH, "dotarch" },
+ { SELECTION_REL, "rel" },
+ { SELECTION_INSTALLED_ONLY, "installedonly" },
+ { SELECTION_GLOB, "glob" },
+ { SELECTION_FLAT, "flat" },
+ { SELECTION_NOCASE, "nocase" },
+ { SELECTION_SOURCE_ONLY, "sourceonly" },
+ { SELECTION_WITH_SOURCE, "withsource" },
+ { 0, 0 }
+};
+
typedef struct strqueue {
char **str;
strqueue_split(Strqueue *q, const char *s)
{
const char *p;
+ if (!s)
+ return;
while ((p = strchr(s, '\n')) != 0)
{
q->str = solv_extend(q->str, q->nstr, 1, sizeof(*q->str), STRQUEUE_BLOCK);
strqueue_pushjoin(osq, "+", sq2->str[j++], 0);
}
-static inline int
-pool_isknownarch(Pool *pool, Id id)
+
+static const char *
+testcase_id2str(Pool *pool, Id id, int isname)
{
- 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;
+ const char *s = pool_id2str(pool, id);
+ const char *ss;
+ char *s2, *s2p;
+ int bad = 0, paren = 0, parenbad = 0;
+
+ if (id == 0)
+ return "<NULL>";
+ if (id == 1)
+ return "\\00";
+ if (strchr("[(<=>!", *s))
+ bad++;
+ if (!strncmp(s, "namespace:", 10))
+ bad++;
+ for (ss = s + bad; *ss; ss++)
+ {
+ if (*ss == ' ' || *ss == '\\' || *(unsigned char *)ss < 32 || *ss == '(' || *ss == ')')
+ bad++;
+ if (*ss == '(')
+ paren = paren == 0 ? 1 : -1;
+ else if (*ss == ')')
+ {
+ paren = paren == 1 ? 0 : -1;
+ if (!paren)
+ parenbad += 2;
+ }
+ }
+ if (isname && ss - s > 4 && !strcmp(ss - 4, ":any"))
+ bad++;
+ if (!paren && !(bad - parenbad))
+ return s;
+
+ /* we need escaping! */
+ s2 = s2p = pool_alloctmpspace(pool, strlen(s) + bad * 2 + 1);
+ ss = s;
+ if (!strncmp(s, "namespace:", 10))
+ {
+ strcpy(s2p, "namespace\\3a");
+ s2p += 12;
+ s += 10;
+ }
+ for (; *ss; ss++)
+ {
+ *s2p++ = *ss;
+ if ((ss == s && strchr("[(<=>!", *s)) || *ss == ' ' || *ss == '\\' || *(unsigned char *)ss < 32 || *ss == '(' || *ss == ')')
+ {
+ s2p[-1] = '\\';
+ solv_bin2hex((unsigned char *)ss, 1, s2p);
+ s2p += 2;
+ }
+ }
+ *s2p = 0;
+ if (isname && s2p - s2 > 4 && !strcmp(s2p - 4, ":any"))
+ strcpy(s2p - 4, "\\3aany");
+ return s2;
}
-Id
-testcase_str2dep(Pool *pool, char *s)
+struct oplist {
+ Id flags;
+ const char *opname;
+} oplist[] = {
+ { REL_EQ, "=" },
+ { REL_GT | REL_LT | REL_EQ, "<=>" },
+ { REL_LT | REL_EQ, "<=" },
+ { REL_GT | REL_EQ, ">=" },
+ { REL_GT, ">" },
+ { REL_GT | REL_LT, "<>" },
+ { REL_AND, "&" },
+ { REL_OR , "|" },
+ { REL_WITH , "+" },
+ { REL_NAMESPACE , "<NAMESPACE>" },
+ { REL_ARCH, "." },
+ { REL_MULTIARCH, "<MULTIARCH>" },
+ { REL_FILECONFLICT, "<FILECONFLICT>" },
+ { REL_COND, "<IF>" },
+ { REL_COMPAT, "compat >=" },
+ { REL_KIND, "<KIND>" },
+ { REL_LT, "<" },
+ { 0, 0 }
+};
+
+static const char *
+testcase_dep2str_complex(Pool *pool, Id id, int addparens)
{
- char *n, *a;
- Id id;
- int flags;
+ Reldep *rd;
+ char *s;
+ const char *s2;
+ int needparens;
+ struct oplist *op;
+
+ if (!ISRELDEP(id))
+ return testcase_id2str(pool, id, 1);
+ rd = GETRELDEP(pool, id);
+
+ /* check for special shortcuts */
+ if (rd->flags == REL_NAMESPACE && !ISRELDEP(rd->name) && !strncmp(pool_id2str(pool, rd->name), "namespace:", 10))
+ {
+ const char *ns = pool_id2str(pool, rd->name);
+ int nslen = strlen(ns);
+ /* special namespace formatting */
+ const char *evrs = testcase_dep2str_complex(pool, rd->evr, 0);
+ s = pool_tmpappend(pool, evrs, ns, "()");
+ memmove(s + nslen + 1, s, strlen(s) - nslen - 2);
+ memcpy(s, ns, nslen);
+ s[nslen] = '(';
+ return s;
+ }
+ if (rd->flags == REL_MULTIARCH && !ISRELDEP(rd->name) && rd->evr == ARCH_ANY)
+ {
+ /* special :any suffix */
+ const char *ns = testcase_id2str(pool, rd->name, 1);
+ return pool_tmpappend(pool, ns, ":any", 0);
+ }
- 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;
+ needparens = 0;
+ if (ISRELDEP(rd->name))
+ {
+ Reldep *rd2 = GETRELDEP(pool, rd->name);
+ needparens = 1;
+ if (rd->flags > 7 && rd->flags != REL_COMPAT && rd2->flags && rd2->flags <= 7)
+ needparens = 0;
}
+ s = (char *)testcase_dep2str_complex(pool, rd->name, needparens);
+
+ if (addparens)
+ {
+ s = pool_tmpappend(pool, s, "(", 0);
+ memmove(s + 1, s, strlen(s + 1));
+ s[0] = '(';
+ }
+ for (op = oplist; op->flags; op++)
+ if (rd->flags == op->flags)
+ break;
+ if (op->flags)
+ {
+ s = pool_tmpappend(pool, s, " ", op->opname);
+ s = pool_tmpappend(pool, s, " ", 0);
+ }
+ else
+ {
+ char buf[64];
+ sprintf(buf, " <%u> ", rd->flags);
+ s = pool_tmpappend(pool, s, buf, 0);
+ }
+
+ needparens = 0;
+ if (ISRELDEP(rd->evr))
+ {
+ Reldep *rd2 = GETRELDEP(pool, rd->evr);
+ needparens = 1;
+ if (rd->flags > 7 && rd2->flags && rd2->flags <= 7)
+ needparens = 0;
+ if (rd->flags == REL_AND && rd2->flags == REL_AND)
+ needparens = 0; /* chain */
+ if (rd->flags == REL_OR && rd2->flags == REL_OR)
+ needparens = 0; /* chain */
+ if (rd->flags > 0 && rd->flags < 8 && rd2->flags == REL_COMPAT)
+ needparens = 0; /* chain */
+ }
+ if (!ISRELDEP(rd->evr))
+ s2 = testcase_id2str(pool, rd->evr, 0);
+ else
+ s2 = testcase_dep2str_complex(pool, rd->evr, needparens);
+ if (addparens)
+ s = pool_tmpappend(pool, s, s2, ")");
+ else
+ s = pool_tmpappend(pool, s, s2, 0);
+ pool_freetmpspace(pool, s2);
+ return s;
+}
+
+const char *
+testcase_dep2str(Pool *pool, Id id)
+{
+ return testcase_dep2str_complex(pool, id, 0);
+}
+
+
+/* Convert a simple string. Also handle the :any suffix */
+static Id
+testcase_str2dep_simple(Pool *pool, const char **sp, int isname)
+{
+ int haveesc = 0;
+ int paren = 0;
+ int isany = 0;
+ Id id;
+ const char *s;
+ for (s = *sp; *s; s++)
+ {
+ if (*s == '\\')
+ haveesc++;
+ if (*s == ' ' || *(unsigned char *)s < 32)
+ break;
+ if (*s == '(')
+ paren++;
+ if (*s == ')' && paren-- <= 0)
+ break;
+ }
+ if (isname && s - *sp > 4 && !strncmp(s - 4, ":any", 4))
+ {
+ isany = 1;
+ s -= 4;
+ }
+ if (!haveesc)
+ {
+ if (s - *sp == 6 && !strncmp(*sp, "<NULL>", 6))
+ id = 0;
+ else
+ id = pool_strn2id(pool, *sp, s - *sp, 1);
+ }
+ else if (s - *sp == 3 && !strncmp(*sp, "\\00", 3))
+ id = 1;
+ else
+ {
+ char buf[128], *bp, *bp2;
+ const char *sp2;
+ bp = s - *sp >= 128 ? solv_malloc(s - *sp + 1) : buf;
+ for (bp2 = bp, sp2 = *sp; sp2 < s;)
+ {
+ *bp2++ = *sp2++;
+ if (bp2[-1] == '\\')
+ solv_hex2bin(&sp2, (unsigned char *)bp2 - 1, 1);
+ }
+ *bp2 = 0;
+ id = pool_str2id(pool, bp, 1);
+ if (bp != buf)
+ solv_free(bp);
+ }
+ if (isany)
+ {
+ id = pool_rel2id(pool, id, ARCH_ANY, REL_MULTIARCH, 1);
+ s += 4;
+ }
+ *sp = s;
+ return id;
+}
+
+
+static Id
+testcase_str2dep_complex(Pool *pool, const char **sp, int relop)
+{
+ const char *s = *sp;
+ Id flags, id, id2, namespaceid = 0;
+ struct oplist *op;
+
while (*s == ' ' || *s == '\t')
s++;
- n = s;
- while (*s && *s != ' ' && *s != '\t' && *s != '<' && *s != '=' && *s != '>')
+ if (!strncmp(s, "namespace:", 10))
{
- if (*s == '(')
+ /* special namespace hack */
+ const char *s2;
+ for (s2 = s + 10; *s2 && *s2 != '('; s2++)
+ ;
+ if (*s2 == '(')
{
- while (*s && *s != ')')
- s++;
+ namespaceid = pool_strn2id(pool, s, s2 - s, 1);
+ s = s2;
}
- else
- s++;
}
- if ((a = strchr(n, '.')) != 0 && a + 1 < s && s[-1] != ')')
+ if (*s == '(')
{
- Id archid = pool_strn2id(pool, a + 1, s - (a + 1), 0);
- if (pool_isknownarch(pool, archid))
+ s++;
+ id = testcase_str2dep_complex(pool, &s, 0);
+ if (!s || *s != ')')
{
- id = pool_strn2id(pool, n, a - n, 1);
- id = pool_rel2id(pool, id, archid, REL_ARCH, 1);
+ *sp = 0;
+ return 0;
}
- else
- id = pool_strn2id(pool, n, s - n, 1);
+ s++;
}
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;
+ id = testcase_str2dep_simple(pool, &s, relop ? 0 : 1);
+ if (namespaceid)
+ id = pool_rel2id(pool, namespaceid, id, REL_NAMESPACE, 1);
+
+ for (;;)
+ {
+ while (*s == ' ' || *s == '\t')
+ s++;
+ if (!*s || *s == ')' || (relop && strncmp(s, "compat >= ", 10) != 0))
+ {
+ *sp = s;
+ return id;
+ }
+
+ /* we have an op! Find the end */
+ flags = -1;
+ if (s[0] == '<' && (s[1] >= '0' && s[1] <= '9'))
+ {
+ const char *s2;
+ for (s2 = s + 1; *s2 >= '0' && *s2 <= '9'; s2++)
+ ;
+ if (*s2 == '>')
+ {
+ flags = strtoul(s + 1, 0, 10);
+ s = s2 + 1;
+ }
+ }
+ if (flags == -1)
+ {
+ for (op = oplist; op->flags; op++)
+ if (!strncmp(s, op->opname, strlen(op->opname)))
+ break;
+ if (!op->flags)
+ {
+ *sp = 0;
+ return 0;
+ }
+ flags = op->flags;
+ s += strlen(op->opname);
+ }
+ id2 = testcase_str2dep_complex(pool, &s, flags > 0 && flags < 8);
+ if (!s)
+ {
+ *sp = 0;
+ return 0;
+ }
+ id = pool_rel2id(pool, id, id2, flags, 1);
}
- 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);
}
+Id
+testcase_str2dep(Pool *pool, const char *s)
+{
+ Id id = testcase_str2dep_complex(pool, &s, 0);
+ return s && !*s ? id : 0;
+}
+
+/**********************************************************/
+
const char *
testcase_repoid2str(Pool *pool, Id repoid)
{
else
{
char buf[20];
- sprintf(buf, "@#%d", repoid);
+ sprintf(buf, "#%d", repoid);
return pool_tmpjoin(pool, buf, 0, 0);
}
}
testcase_solvid2str(Pool *pool, Id p)
{
Solvable *s = pool->solvables + p;
- const char *str;
- char buf[20];
+ const char *n, *e, *a;
+ char *str, buf[20];
if (p == SYSTEMSOLVABLE)
return "@SYSTEM";
- str = pool_solvid2str(pool, 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);
if (!s->repo)
return pool_tmpappend(pool, str, "@", 0);
if (s->repo->name)
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)
{
return ret;
}
+static int
+str2selflags(Pool *pool, char *s) /* modifies the string! */
+{
+ int i, selflags = 0;
+ while (s)
+ {
+ char *se = strchr(s, ',');
+ if (se)
+ *se++ = 0;
+ for (i = 0; selflags2str[i].str; i++)
+ if (!strcmp(s, selflags2str[i].str))
+ {
+ selflags |= selflags2str[i].flag;
+ break;
+ }
+ if (!selflags2str[i].str)
+ pool_debug(pool, SOLV_ERROR, "str2job: unknown selection flag '%s'\n", s);
+ s = se;
+ }
+ return selflags;
+}
+
+static int
+str2jobflags(Pool *pool, char *s) /* modifies the string */
+{
+ int i, jobflags = 0;
+ while (s)
+ {
+ char *se = strchr(s, ',');
+ if (se)
+ *se++ = 0;
+ for (i = 0; jobflags2str[i].str; i++)
+ if (!strcmp(s, jobflags2str[i].str))
+ {
+ jobflags |= jobflags2str[i].flag;
+ break;
+ }
+ if (!jobflags2str[i].str)
+ pool_debug(pool, SOLV_ERROR, "str2job: unknown job flag '%s'\n", s);
+ s = se;
+ }
+ return jobflags;
+}
+
Id
testcase_str2job(Pool *pool, const char *str, Id *whatp)
{
if (npieces < 3)
{
pool_debug(pool, SOLV_ERROR, "str2job: bad line '%s'\n", str);
- return 0;
+ solv_free(pieces);
+ return -1;
}
for (i = 0; job2str[i].str; i++)
if (!job2str[i].str)
{
pool_debug(pool, SOLV_ERROR, "str2job: unknown job '%s'\n", str);
- return 0;
+ solv_free(pieces);
+ return -1;
}
job = job2str[i].job;
+ what = 0;
if (npieces > 3)
{
char *flags = pieces[npieces - 1];
- char *nf;
if (*flags == '[' && flags[strlen(flags) - 1] == ']')
{
npieces--;
flags++;
- flags[strlen(flags) - 1] = ',';
- while (*flags)
- {
- for (nf = flags; *nf != ','; nf++)
- ;
- *nf++ = 0;
- for (i = 0; jobflags2str[i].str; i++)
- if (!strcmp(flags, jobflags2str[i].str))
- break;
- if (!jobflags2str[i].str)
- {
- pool_debug(pool, SOLV_ERROR, "str2job: unknown jobflags in '%s'\n", str);
- return 0;
- }
- job |= jobflags2str[i].flag;
- flags = nf;
- }
+ 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);
- return 0;
+ solv_free(pieces);
+ return -1;
}
job |= SOLVER_SOLVABLE;
what = testcase_str2solvid(pool, pieces[2]);
if (!what)
{
pool_debug(pool, SOLV_ERROR, "str2job: unknown package '%s'\n", pieces[2]);
- return 0;
+ solv_free(pieces);
+ return -1;
}
}
else if (!strcmp(pieces[1], "name") || !strcmp(pieces[1], "provides"))
for (sp = pieces[2]; sp < pieces[npieces - 1]; sp++)
if (*sp == 0)
*sp = ' ';
- what = testcase_str2dep(pool, pieces[2]);
+ what = 0;
+ if (pieces[1][0] == 'p' && strncmp(pieces[2], "namespace:", 10) == 0)
+ {
+ char *spe = strchr(pieces[2], '(');
+ int l = strlen(pieces[2]);
+ if (spe && pieces[2][l - 1] == ')')
+ {
+ /* special namespace provides */
+ if (strcmp(spe, "(<NULL>)") != 0)
+ {
+ pieces[2][l - 1] = 0;
+ what = testcase_str2dep(pool, spe + 1);
+ pieces[2][l - 1] = ')';
+ }
+ what = pool_rel2id(pool, pool_strn2id(pool, pieces[2], spe - pieces[2], 1), what, REL_NAMESPACE, 1);
+ }
+ }
+ if (!what)
+ what = testcase_str2dep(pool, pieces[2]);
if (pieces[1][0] == 'n')
job |= SOLVER_SOLVABLE_NAME;
else
{
pool_debug(pool, SOLV_ERROR, "str2job: unknown package '%s'\n", pieces[i]);
queue_free(&q);
- return 0;
+ solv_free(pieces);
+ return -1;
}
queue_push(&q, p);
}
if (npieces != 3)
{
pool_debug(pool, SOLV_ERROR, "str2job: bad line '%s'\n", str);
- return 0;
+ solv_free(pieces);
+ return -1;
}
repo = testcase_str2repo(pool, pieces[2]);
if (!repo)
{
pool_debug(pool, SOLV_ERROR, "str2job: unknown repo '%s'\n", pieces[2]);
- return 0;
+ solv_free(pieces);
+ return -1;
}
job |= SOLVER_SOLVABLE_REPO;
what = repo->repoid;
if (npieces != 3 && strcmp(pieces[2], "packages") != 0)
{
pool_debug(pool, SOLV_ERROR, "str2job: bad line '%s'\n", str);
- return 0;
+ solv_free(pieces);
+ return -1;
}
job |= SOLVER_SOLVABLE_ALL;
what = 0;
else
{
pool_debug(pool, SOLV_ERROR, "str2job: unknown selection in '%s'\n", str);
- return 0;
+ solv_free(pieces);
+ return -1;
}
*whatp = what;
+ solv_free(pieces);
return job;
}
+int
+addselectionjob(Pool *pool, char **pieces, int npieces, Queue *jobqueue)
+{
+ Id job;
+ int i, r;
+ int selflags;
+ Queue sel;
+
+ 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]);
+ return -1;
+ }
+ job = job2str[i].job;
+ 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 (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;
+ Id id, *dp;
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)
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;
- }
- }
+ continue;
+ idstr = testcase_dep2str(pool, id);
if (!tagwritten)
{
fprintf(fp, "+%s\n", tag);
}
fprintf(fp, "%s\n", idstr);
}
- if (key == SOLVABLE_PROVIDES)
+ if (tagwritten)
+ fprintf(fp, "-%s\n", tag);
+}
+
+static void
+writefilelist(Repo *repo, FILE *fp, const char *tag, Solvable *s)
+{
+ Pool *pool = repo->pool;
+ int tagwritten = 0;
+ Dataiterator di;
+
+ dataiterator_init(&di, pool, repo, s - pool->solvables, SOLVABLE_FILELIST, 0, 0);
+ while (dataiterator_step(&di))
{
- /* 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 (!tagwritten)
{
- 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);
+ fprintf(fp, "+%s\n", tag);
+ tagwritten = 1;
}
+ fprintf(fp, "%s\n", s);
}
if (tagwritten)
fprintf(fp, "-%s\n", tag);
+ dataiterator_free(&di);
}
int
-testcase_write_susetags(Repo *repo, FILE *fp)
+testcase_write_testtags(Repo *repo, FILE *fp)
{
Pool *pool = repo->pool;
Solvable *s;
const char *tmp;
unsigned int ti;
- fprintf(fp, "=Ver: 2.0\n");
+ fprintf(fp, "=Ver: 3.0\n");
FOR_REPO_SOLVABLES(repo, p, s)
{
name = pool_id2str(pool, s->name);
release = strrchr(evr, '-');
if (!release)
release = evr + strlen(evr);
- fprintf(fp, "=Pkg: %s %.*s %s %s\n", name, release - evr, evr, *release && release[1] ? release + 1 : "-", arch);
+ 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);
ti = solvable_lookup_num(s, SOLVABLE_BUILDTIME, 0);
if (ti)
fprintf(fp, "=Tim: %u\n", ti);
+ writefilelist(repo, fp, "Fls:", s);
}
return 0;
}
-#ifndef ENABLE_SUSEREPO
-
static inline Offset
adddep(Repo *repo, Offset olddeps, char *str, Id marker)
{
}
static void
-finish_solvable(Pool *pool, Repodata *data, Solvable *s, char *filelist, int nfilelist)
+finish_v2_solvable(Pool *pool, Repodata *data, Solvable *s, char *filelist, int nfilelist)
{
if (nfilelist)
{
int l;
- Id did;
- for (l = 0; l < nfilelist; l += strlen(filelist + l) + 1)
+ Id did;
+ for (l = 0; l < nfilelist; l += strlen(filelist + l) + 1)
{
char *p = strrchr(filelist + l, '/');
- if (!p)
+ if (!p)
continue;
- *p++ = 0;
+ *p++ = 0;
did = repodata_str2dir(data, filelist + l, 1);
- p[-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);
}
/* stripped down version of susetags parser used for testcases */
int
-testcase_add_susetags(Repo *repo, FILE *fp, int flags)
+testcase_add_testtags(Repo *repo, FILE *fp, int flags)
{
Pool *pool = repo->pool;
char *line, *linep;
char *filelist = 0;
int afilelist = 0;
int nfilelist = 0;
+ int tagsversion = 0;
+ int addselfprovides = 1; /* for compat reasons */
data = repo_add_repodata(repo, flags);
s = 0;
linep += strlen(linep);
if (linep == line || linep[-1] != '\n')
continue;
- *--linep = 0;
+ linep[-1] = 0;
linep = line + intag;
if (intag)
{
tag = line[1] << 16 | line[2] << 8 | line[3];
switch(tag)
{
+ case 'V' << 16 | 'e' << 8 | 'r':
+ tagsversion = atoi(line + 6);
+ addselfprovides = tagsversion < 3 || strstr(line + 6, "addselfprovides") != 0;
+ break;
case 'P' << 16 | 'k' << 8 | 'g':
if (s)
- finish_solvable(pool, data, s, filelist, nfilelist);
+ {
+ if (tagsversion == 2)
+ finish_v2_solvable(pool, data, s, filelist, nfilelist);
+ if (addselfprovides && 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);
+ }
nfilelist = 0;
if (split(line + 5, sp, 5) != 4)
break;
s->requires = adddep(repo, s->requires, line + 6, SOLVABLE_PREREQMARKER);
break;
case 'P' << 16 | 'r' << 8 | 'v':
- if (line[6] == '/')
+ /* version 2 had the file list at the end of the provides */
+ if (tagsversion == 2)
{
- int l = strlen(line + 6) + 1;
- if (nfilelist + l > afilelist)
+ if (line[6] == '/')
{
- afilelist = nfilelist + l + 512;
- filelist = solv_realloc(filelist, afilelist);
+ 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;
}
- 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 'F' << 16 | 'l' << 8 | 's':
+ {
+ char *p = strrchr(line + 6, '/');
+ Id did;
+ if (!p)
+ break;
+ *p++ = 0;
+ did = repodata_str2dir(data, line + 6, 1);
+ if (!did)
+ did = repodata_str2dir(data, "/", 1);
+ repodata_add_dirstr(data, s - pool->solvables, SOLVABLE_FILELIST, did, p);
+ break;
+ }
case 'O' << 16 | 'b' << 8 | 's':
s->obsoletes = adddep(repo, s->obsoletes, line + 6, 0);
break;
}
}
if (s)
- finish_solvable(pool, data, s, filelist, nfilelist);
+ {
+ if (tagsversion == 2)
+ finish_v2_solvable(pool, data, s, filelist, nfilelist);
+ if (addselfprovides && 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);
+ }
solv_free(line);
solv_free(filelist);
repodata_free_dircache(data);
return 0;
}
-#else
+const char *
+testcase_getpoolflags(Pool *pool)
+{
+ const char *str = 0;
+ int i, v;
+ for (i = 0; poolflags2str[i].str; i++)
+ {
+ v = pool_get_flag(pool, poolflags2str[i].flag);
+ if (v == poolflags2str[i].def)
+ continue;
+ str = pool_tmpappend(pool, str, v ? " " : " !", poolflags2str[i].str);
+ }
+ return str ? str + 1 : "";
+}
int
-testcase_add_susetags(Repo *repo, FILE *fp, int flags)
+testcase_setpoolflags(Pool *pool, const char *str)
{
- return repo_add_susetags(repo, fp, 0, 0, flags);
+ const char *p = str, *s;
+ int i, v;
+ for (;;)
+ {
+ while (*p == ' ' || *p == '\t' || *p == ',')
+ p++;
+ v = 1;
+ if (*p == '!')
+ {
+ p++;
+ v = 0;
+ }
+ if (!*p)
+ break;
+ s = p;
+ while (*p && *p != ' ' && *p != '\t' && *p != ',')
+ p++;
+ for (i = 0; poolflags2str[i].str; i++)
+ 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;
+ }
+ pool_set_flag(pool, poolflags2str[i].flag, v);
+ }
+ return 1;
}
-#endif
+void
+testcase_resetpoolflags(Pool *pool)
+{
+ int i;
+ for (i = 0; poolflags2str[i].str; i++)
+ pool_set_flag(pool, poolflags2str[i].flag, poolflags2str[i].def);
+}
const char *
testcase_getsolverflags(Solver *solv)
break;
if (!solverflags2str[i].str)
{
- pool_debug(solv->pool, SOLV_ERROR, "setsolverflags: unknown flag '%.*s'\n", p - s, s);
+ 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);
Strqueue sq;
Queue q;
int i;
- void *chk;
+ Chksum *chk;
const unsigned char *md5;
int md5l;
const char *s;
{
Strqueue sq;
Queue q;
- void *chk;
+ Chksum *chk;
const unsigned char *md5;
int i, md5l;
const char *s;
testcase_solutionid(Solver *solv, Id problem, Id solution)
{
Id intid;
- void *chk;
+ Chksum *chk;
const unsigned char *md5;
int md5l;
const char *s;
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;
for (i = 0; class2str[i].str; i++)
{
queue_empty(&q);
- transaction_classify_pkgs(trans, 0, class2str[i].class, 0, 0, &q);
+ transaction_classify_pkgs(trans, SOLVER_TRANSACTION_KEEP_PSEUDO, class2str[i].class, 0, 0, &q);
for (j = 0; j < q.count; j++)
{
p = q.elements[j];
queue_free(&qs);
}
+ if ((resultflags & TESTCASE_RESULT_UNNEEDED) != 0)
+ {
+ 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_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);
+ 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);
+ }
+ }
+ }
+ 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);
+ }
+
strqueue_sort(&sq);
result = strqueue_join(&sq);
strqueue_free(&sq);
int
-testcase_write(Solver *solv, char *dir, int resultflags)
+testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasename, const char *resultname)
{
Pool *pool = solv->pool;
Repo *repo;
char *cmd, *out;
const char *s;
+ if (!testcasename)
+ testcasename = "testcase.t";
+ if (!resultname)
+ resultname = "solver.result";
+
if (mkdir(dir, 0777) && errno != EEXIST)
{
pool_debug(solv->pool, SOLV_ERROR, "testcase_write: could not create directory '%s'\n", dir);
out = pool_tmpjoin(pool, name, ".repo", ".gz");
cmd = pool_tmpjoin(pool, "repo ", name, " ");
cmd = pool_tmpappend(pool, cmd, priobuf, " ");
- cmd = pool_tmpappend(pool, cmd, "susetags ", out);
+ cmd = pool_tmpappend(pool, cmd, "testtags ", out);
strqueue_push(&sq, cmd);
out = pool_tmpjoin(pool, dir, "/", out);
if (!(fp = solv_xfopen(out, "w")))
strqueue_free(&sq);
return 0;
}
- testcase_write_susetags(repo, fp);
+ testcase_write_testtags(repo, fp);
if (fclose(fp))
{
pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
}
/* hmm, this is not optimal... we currently search for the lowest score */
lowscore = 0;
- arch = ARCH_NOARCH;
+ arch = pool->solvables[SYSTEMSOLVABLE].arch;
for (i = 0; i < pool->lastarch; i++)
{
if (pool->id2arch[i] == 1 && !lowscore)
lowscore = pool->id2arch[i];
}
}
- cmd = pool_tmpjoin(pool, "system ", pool_id2str(pool, arch), pool->disttype == DISTTYPE_DEB ? " deb" : " rpm");
+ cmd = pool_tmpjoin(pool, "system ", pool->lastarch ? pool_id2str(pool, arch) : "unset", 0);
+ for (i = 0; disttype2str[i].str != 0; i++)
+ if (pool->disttype == disttype2str[i].type)
+ break;
+ pool_tmpappend(pool, cmd, " ", disttype2str[i].str ? disttype2str[i].str : "unknown");
if (pool->installed)
cmd = pool_tmpappend(pool, cmd, " ", testcase_repoid2str(pool, pool->installed->repoid));
strqueue_push(&sq, cmd);
+ s = testcase_getpoolflags(solv->pool);
+ if (*s)
+ {
+ cmd = pool_tmpjoin(pool, "poolflags ", s, 0);
+ strqueue_push(&sq, cmd);
+ }
if (pool->vendorclasses)
{
}
}
+ /* 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)
{
Reldep *rd = pool->rels + rid;
if (rd->flags != REL_NAMESPACE || rd->name == NAMESPACE_OTHERPROVIDERS)
continue;
- /* check if we evaluated it, also skip empty results */
- if (!(d = pool->whatprovides_rel[rid]) || !pool->whatprovidesdata[d])
+ /* evaluate all namespace ids, skip empty results */
+ d = pool_whatprovides(pool, MAKERELDEP(rid));
+ if (!d || !pool->whatprovidesdata[d])
continue;
cmd = pool_tmpjoin(pool, "namespace ", pool_id2str(pool, rd->name), "(");
cmd = pool_tmpappend(pool, cmd, pool_id2str(pool, rd->evr), ")");
if (resultflags)
{
char *result;
- out = pool_tmpjoin(pool, dir, "/", "solver.result");
- if (!(fp = fopen(out, "w")))
- {
- pool_debug(solv->pool, SOLV_ERROR, "testcase_write: could not open '%s' for writing\n", out);
- strqueue_free(&sq);
- return 0;
- }
- result = testcase_solverresult(solv, resultflags);
- if (fwrite(result, strlen(result), 1, fp) != 1)
- {
- pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
- solv_free(result);
- strqueue_free(&sq);
- return 0;
- }
- solv_free(result);
- if (fclose(fp))
- {
- pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
- strqueue_free(&sq);
- return 0;
- }
cmd = 0;
for (i = 0; resultflags2str[i].str; i++)
if ((resultflags & resultflags2str[i].flag) != 0)
cmd = pool_tmpappend(pool, cmd, cmd ? "," : 0, resultflags2str[i].str);
- cmd = pool_tmpjoin(pool, "result ", cmd ? cmd : "?", " solver.result");
+ cmd = pool_tmpjoin(pool, "result ", cmd ? cmd : "?", 0);
+ cmd = pool_tmpappend(pool, cmd, " ", resultname);
strqueue_push(&sq, cmd);
+ result = testcase_solverresult(solv, resultflags);
+ if (!strcmp(resultname, "<inline>"))
+ {
+ int i;
+ Strqueue rsq;
+ strqueue_init(&rsq);
+ strqueue_split(&rsq, result);
+ for (i = 0; i < rsq.nstr; i++)
+ {
+ cmd = pool_tmpjoin(pool, "#>", rsq.str[i], 0);
+ strqueue_push(&sq, cmd);
+ }
+ strqueue_free(&rsq);
+ }
+ else
+ {
+ 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);
+ 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");
+ solv_free(result);
+ strqueue_free(&sq);
+ fclose(fp);
+ return 0;
+ }
+ if (fclose(fp))
+ {
+ pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
+ strqueue_free(&sq);
+ return 0;
+ }
+ }
+ solv_free(result);
}
cmd = strqueue_join(&sq);
- out = pool_tmpjoin(pool, dir, "/", "testcase.t");
+ 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);
return 0;
}
- if (fwrite(cmd, strlen(cmd), 1, fp) != 1)
+ if (*cmd && fwrite(cmd, strlen(cmd), 1, fp) != 1)
{
pool_debug(solv->pool, SOLV_ERROR, "testcase_write: write error\n");
strqueue_free(&sq);
+ fclose(fp);
return 0;
}
if (fclose(fp))
return 1;
}
+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;
+ if (rp - result + 256 >= resultl)
+ {
+ resultl = rp - result;
+ result = solv_realloc(result, resultl + 1024);
+ rp = result + resultl;
+ resultl += 1024;
+ }
+ if (!fgets(rp, resultl - (rp - result), fp))
+ *rp = 0;
+ rl = strlen(rp);
+ if (rl && (rp == result || rp[-1] == '\n'))
+ {
+ if (rl > 1 && rp[0] == '#' && rp[1] == '>')
+ {
+ memmove(rp, rp + 2, rl - 2);
+ rl -= 2;
+ }
+ else
+ {
+ while (rl + 16 > *buflp)
+ {
+ *bufp = solv_realloc(*bufp, *buflp + 512);
+ *buflp += 512;
+ }
+ memmove(*bufp, rp, rl);
+ if ((*bufp)[rl - 1] == '\n')
+ {
+ ungetc('\n', fp);
+ rl--;
+ }
+ (*bufp)[rl] = 0;
+ (*bufpp) = *bufp + rl;
+ rl = 0;
+ }
+ }
+ if (rl <= 0)
+ {
+ *rp = 0;
+ break;
+ }
+ rp += rl;
+ }
+ return result;
+}
+
+static char *
+read_file(FILE *fp)
+{
+ char *result = solv_malloc(1024);
+ char *rp = result;
+ int resultl = 1024;
+
+ for (;;)
+ {
+ size_t rl;
+ if (rp - result + 256 >= resultl)
+ {
+ resultl = rp - result;
+ result = solv_realloc(result, resultl + 1024);
+ rp = result + resultl;
+ resultl += 1024;
+ }
+ rl = fread(rp, 1, resultl - (rp - result), fp);
+ if (rl <= 0)
+ {
+ *rp = 0;
+ break;
+ }
+ rp += rl;
+ }
+ return result;
+}
+
+static int
+str2resultflags(Pool *pool, char *s) /* modifies the string! */
+{
+ int i, resultflags = 0;
+ while (s)
+ {
+ char *se = strchr(s, ',');
+ if (se)
+ *se++ = 0;
+ for (i = 0; resultflags2str[i].str; i++)
+ if (!strcmp(s, resultflags2str[i].str))
+ {
+ resultflags |= resultflags2str[i].flag;
+ break;
+ }
+ if (!resultflags2str[i].str)
+ pool_debug(pool, SOLV_ERROR, "result: unknown flag '%s'\n", s);
+ s = se;
+ }
+ return resultflags;
+}
+
Solver *
testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp, int *resultflagsp)
{
int npieces = 0;
int prepared = 0;
int closefp = !fp;
+ int poolflagsreset = 0;
if (!fp && !(fp = fopen(testcase, "r")))
{
return 0;
}
testcasedir = solv_strdup(testcase);
- if ((s = strchr(testcasedir, '/')) != 0)
+ if ((s = strrchr(testcasedir, '/')) != 0)
s[1] = 0;
else
*testcasedir = 0;
const char *rdata;
prepared = 0;
+ if (!poolflagsreset)
+ {
+ poolflagsreset = 1;
+ testcase_resetpoolflags(pool); /* hmm */
+ }
if (sscanf(pieces[2], "%d.%d", &prio, &subprio) != 2)
{
subprio = 0;
}
repo->priority = prio;
repo->subpriority = subprio;
- rdata = pool_tmpjoin(pool, testcasedir, pieces[4], 0);
- if ((rfp = solv_xfopen(rdata, "r")) == 0)
- {
- pool_debug(pool, SOLV_ERROR, "testcase_read: could not open '%s'\n", rdata);
- }
- else if (!strcmp(pieces[3], "susetags"))
+ if (strcmp(pieces[3], "empty") != 0)
{
- testcase_add_susetags(repo, rfp, 0);
- fclose(rfp);
- }
- else
- {
- fclose(rfp);
- pool_debug(pool, SOLV_ERROR, "testcase_read: unknown repo type for repo '%s'\n", repo->name);
+ const char *repotype = pool_tmpjoin(pool, pieces[3], 0, 0); /* gets overwritten in <inline> case */
+ if (!strcmp(pieces[4], "<inline>"))
+ {
+ char *idata = read_inline_file(fp, &buf, &bufp, &bufl);
+ rdata = "<inline>";
+ rfp = solv_xfopen_buf(rdata, &idata, 0, "rf");
+ }
+ else
+ {
+ rdata = pool_tmpjoin(pool, testcasedir, pieces[4], 0);
+ rfp = solv_xfopen(rdata, "r");
+ }
+ if (!rfp)
+ {
+ pool_debug(pool, SOLV_ERROR, "testcase_read: could not open '%s'\n", rdata);
+ }
+ else if (!strcmp(repotype, "testtags"))
+ {
+ testcase_add_testtags(repo, rfp, 0);
+ fclose(rfp);
+ }
+ else if (!strcmp(repotype, "solv"))
+ {
+ repo_add_solv(repo, rfp, 0);
+ fclose(rfp);
+ }
+#if 0
+ else if (!strcmp(repotype, "helix"))
+ {
+ extern int repo_add_helix(Repo *repo, FILE *fp, int flags);
+ repo_add_helix(repo, rfp, 0);
+ fclose(rfp);
+ }
+#endif
+ else
+ {
+ fclose(rfp);
+ pool_debug(pool, SOLV_ERROR, "testcase_read: unknown repo type for repo '%s'\n", repo->name);
+ }
}
}
else if (!strcmp(pieces[0], "system") && npieces >= 3)
{
+ int i;
prepared = 0;
- pool_setarch(pool, pieces[1]);
+ /* 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)
+ {
+#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]);
+#endif
+ }
+ if (strcmp(pieces[1], "unset") == 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]);
{
char *sp;
Id how, what;
- if (!prepared)
+ if (prepared <= 0)
{
pool_addfileprovides(pool);
pool_createwhatprovides(pool);
prepared = 1;
}
+ if (npieces >= 3 && !strcmp(pieces[2], "selection"))
+ {
+ addselectionjob(pool, pieces + 1, npieces - 1, job);
+ continue;
+ }
/* rejoin */
for (sp = pieces[1]; sp < pieces[npieces - 1]; sp++)
if (*sp == 0)
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);
queue_free(&q);
}
}
+ else if (!strcmp(pieces[0], "poolflags"))
+ {
+ int i;
+ if (!poolflagsreset)
+ {
+ poolflagsreset = 1;
+ testcase_resetpoolflags(pool); /* hmm */
+ }
+ for (i = 1; i < npieces; i++)
+ testcase_setpoolflags(pool, pieces[i]);
+ }
else if (!strcmp(pieces[0], "solverflags") && npieces > 1)
{
int i;
}
else if (!strcmp(pieces[0], "result") && npieces > 1)
{
- FILE *rfp;
+ char *result = 0;
+ int resultflags = str2resultflags(pool, pieces[1]);
const char *rdata;
- int resultflags = 0;
- char *s = pieces[1];
- int i;
- while (s)
- {
- char *se = strchr(s, ',');
- if (se)
- *se++ = 0;
- for (i = 0; resultflags2str[i].str; i++)
- if (!strcmp(s, resultflags2str[i].str))
- {
- resultflags |= resultflags2str[i].flag;
- break;
- }
- if (!resultflags2str[i].str)
- pool_debug(pool, SOLV_ERROR, "result: unknown flag '%s'\n", s);
- s = se;
- }
-
- rdata = pool_tmpjoin(pool, testcasedir, pieces[2], 0);
- if (!strcmp(pieces[1], "<inline>"))
- rfp = fp;
- else
- rfp = fopen(rdata, "r");
- if (!rfp)
+ if (npieces > 2)
{
- pool_debug(pool, SOLV_ERROR, "testcase_read: could not open '%s'\n", rdata);
- }
- else
- {
- /* slurp it in... */
- char *result = solv_malloc(1024);
- char *rp = result;
- int resultl = 1024;
- for (;;)
+ rdata = pool_tmpjoin(pool, testcasedir, pieces[2], 0);
+ if (!strcmp(pieces[2], "<inline>"))
+ result = read_inline_file(fp, &buf, &bufp, &bufl);
+ else
{
- size_t rl;
- if (rp - result + 256 >= resultl)
- {
- resultl = rp - result;
- result = solv_realloc(result, resultl + 1024);
- rp = result + resultl;
- resultl += 1024;
- }
- if (fp == rfp)
- {
- if (!fgets(rp, resultl - (rp - result), fp))
- rl = 0;
- else
- {
- rl = strlen(rp);
- if (rl && (rp == result || rp[-1] == '\n'))
- {
- if (rl > 1 && rp[0] == '#' && rp[1] == '>')
- {
- memmove(rp, rp + 2, rl - 2);
- rl -= 2;
- }
- else
- {
- while (rl + 16 > bufl)
- {
- buf = solv_realloc(buf, bufl + 512);
- bufl += 512;
- }
- memmove(buf, rp, rl);
- if (buf[rl - 1] == '\n')
- {
- ungetc('\n', fp);
- rl--;
- }
- bufp = buf + rl;
- rl = 0;
- }
- }
- }
- }
+ FILE *rfp = fopen(rdata, "r");
+ if (!rfp)
+ pool_debug(pool, SOLV_ERROR, "testcase_read: could not open '%s'\n", rdata);
else
- rl = fread(rp, 1, resultl - (rp - result), rfp);
- if (rl <= 0)
{
- *rp = 0;
- break;
+ result = read_file(rfp);
+ fclose(rfp);
}
- rp += rl;
}
- if (rfp != fp)
- fclose(rfp);
- if (resultp)
- *resultp = result;
- else
- solv_free(result);
- if (resultflagsp)
- *resultflagsp = resultflags;
}
+ if (resultp)
+ *resultp = result;
+ else
+ solv_free(result);
+ if (resultflagsp)
+ *resultflagsp = resultflags;
+ }
+ else if (!strcmp(pieces[0], "nextjob") && npieces == 1)
+ {
+ break;
+ }
+ else if (!strcmp(pieces[0], "disable") && npieces == 3)
+ {
+ Id p;
+ if (strcmp(pieces[1], "pkg"))
+ {
+ pool_debug(pool, SOLV_ERROR, "testcase_read: bad disable type '%s'\n", pieces[1]);
+ continue;
+ }
+ 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);
+ }
+ p = testcase_str2solvid(pool, pieces[2]);
+ if (p)
+ MAPCLR(pool->considered, p);
+ else
+ pool_debug(pool, SOLV_ERROR, "disable: unknown package '%s'\n", pieces[2]);
}
else
{