- rename "susetags" in testcases to "testtags", because we just support a subset...

diff --git a/ext/testcase.c b/ext/testcase.c
index dacafe0..ba4b690 100644 (file)
--- a/ext/testcase.c
+++ b/ext/testcase.c
@@ -18,7 +18,6 @@
 #include "poolarch.h"
 #include "poolvendor.h"
 #include "repo.h"
-#include "repo_susetags.h"
 #include "repo_solv.h"
 #include "solver.h"
 #include "solverdebug.h"
@@ -839,7 +838,7 @@ writedeps(Repo *repo, FILE *fp, const char *tag, Id key, Solvable *s, Offset off
 }
 
 int
-testcase_write_susetags(Repo *repo, FILE *fp)
+testcase_write_testtags(Repo *repo, FILE *fp)
 {
   Pool *pool = repo->pool;
   Solvable *s;
@@ -916,7 +915,7 @@ finish_solvable(Pool *pool, Repodata *data, Solvable *s, char *filelist, int nfi
 
 /* 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;
@@ -1457,7 +1456,7 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
       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")))
@@ -1466,7 +1465,7 @@ testcase_write(Solver *solv, char *dir, int resultflags, const char *testcasenam
          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");
@@ -1814,9 +1813,9 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
                {
                  pool_debug(pool, SOLV_ERROR, "testcase_read: could not open '%s'\n", rdata);
                }
-             else if (!strcmp(repotype, "susetags"))
+             else if (!strcmp(repotype, "testtags"))
                {
-                 testcase_add_susetags(repo, rfp, 0);
+                 testcase_add_testtags(repo, rfp, 0);
                  fclose(rfp);
                }
              else if (!strcmp(repotype, "solv"))

diff --git a/ext/testcase.h b/ext/testcase.h
index ffe2146..20c7095 100644 (file)
--- a/ext/testcase.h
+++ b/ext/testcase.h
@@ -22,8 +22,8 @@ extern Repo *testcase_str2repo(Pool *pool, const char *str);
 extern Id testcase_str2solvid(Pool *pool, const char *str);
 extern const char *testcase_job2str(Pool *pool, Id how, Id what);
 extern Id testcase_str2job(Pool *pool, const char *str, Id *whatp);
-extern int testcase_write_susetags(Repo *repo, FILE *fp);
-extern int testcase_add_susetags(Repo *repo, FILE *fp, int flags);
+extern int testcase_write_testtags(Repo *repo, FILE *fp);
+extern int testcase_add_testtags(Repo *repo, FILE *fp, int flags);
 extern const char *testcase_getsolverflags(Solver *solv);
 extern int testcase_setsolverflags(Solver *solv, const char *str);
 extern void testcase_resetsolverflags(Solver *solv);

diff --git a/test/testcases/cleandeps/mistake.t b/test/testcases/cleandeps/mistake.t
index a8a5437..91ceaef 100644 (file)
--- a/test/testcases/cleandeps/mistake.t
+++ b/test/testcases/cleandeps/mistake.t
@@ -1,5 +1,5 @@
-repo system 0 susetags mistake-system.repo
-repo test 0 susetags mistake-packages.repo
+repo system 0 testtags mistake-system.repo
+repo test 0 testtags mistake-packages.repo
 system i686 rpm system
 job install name A = 2 [cleandeps]
 result transaction,problems <inline>

diff --git a/test/testcases/evrcmp/testevr.t b/test/testcases/evrcmp/testevr.t
index 0a4f8fd..842c63c 100644 (file)
--- a/test/testcases/evrcmp/testevr.t
+++ b/test/testcases/evrcmp/testevr.t
@@ -2,8 +2,8 @@
 # these tests check all dependency match combinations,
 # both with release present and missing
 #
-repo system 0 susetags system.repo
-repo c 0 susetags conflicts.repo
+repo system 0 testtags system.repo
+repo c 0 testtags conflicts.repo
 system i686 rpm system
 solverflags allowuninstall
 job install name CEQ2

diff --git a/test/testcases/sat/assert.t b/test/testcases/sat/assert.t
index b7bc0d7..2a0faf7 100644 (file)
--- a/test/testcases/sat/assert.t
+++ b/test/testcases/sat/assert.t
@@ -1,4 +1,4 @@
-repo system 0 susetags assert-system.repo
+repo system 0 testtags assert-system.repo
 system x86_64 rpm system
 job erase provides AA [weak]
 job install pkg B-1-1.x86_64@system

diff --git a/test/testcases/sat/mm-test.t b/test/testcases/sat/mm-test.t
index ea7b574..573dbb0 100644 (file)
--- a/test/testcases/sat/mm-test.t
+++ b/test/testcases/sat/mm-test.t
@@ -1,8 +1,8 @@
 #
 # testcase to check enabling/disabling of learnt rules
 #
-repo system 0 susetags mm-system.repo.gz
-repo test 0 susetags mm-packages.repo.gz
+repo system 0 testtags mm-system.repo.gz
+repo test 0 testtags mm-packages.repo.gz
 system i686 rpm system
 job install provides E
 job verify all packages