all install order tests pass, they just report the architecture now too ;-)

diff --git a/testsuite/solver/data.deptestomatic/instorder-tests/exercise-preview4-test.solution b/testsuite/solver/data.deptestomatic/instorder-tests/exercise-preview4-test.solution
index 92327b1..0b0777c 100644 (file)
--- a/testsuite/solver/data.deptestomatic/instorder-tests/exercise-preview4-test.solution
+++ b/testsuite/solver/data.deptestomatic/instorder-tests/exercise-preview4-test.solution
@@ -1,55 +1,55 @@
 >!> Installing emacs from channel test
 >!> Calculating installation order ...
 >!> Solution #1:
->!> install bash-3.1-5[test]
->!> install bzip2-1.0.3-6[test]
->!> install coreutils-5.93-6[test]
->!> install cracklib-2.8.6-2[test]
->!> install ctags-2005.12.8-2[test]
->!> install db-4.3.29-4[test]
->!> install emacs-21.3-210[test]
->!> install emacs-info-21.3-210[test]
->!> install filesystem-10.0.42-6[test]
->!> install fillup-1.42-107[test]
->!> install gdbm-1.8.3-233[test]
->!> install glibc-2.3.90-39[test]
->!> install glibc-32bit-2.3.90-40[test]
->!> install gzip-1.3.5-147[test]
->!> install info-4.8-12[test]
->!> install libacl-2.2.31-4[test]
->!> install libattr-2.4.24-4[test]
->!> install libgcc-4.1.0_20051230-3[test]
->!> install libstdc++-4.1.0_20051230-3[test]
->!> install libzio-0.1-7[test]
->!> install ncurses-5.5-4[test]
->!> install pam-0.99.2.1-5[test]
->!> install perl-5.8.7-7[test]
->!> install readline-5.1-5[test]
->!> install zlib-1.2.3-5[test]
+>!> install bash-3.1-5.x86_64[test]
+>!> install bzip2-1.0.3-6.x86_64[test]
+>!> install coreutils-5.93-6.x86_64[test]
+>!> install cracklib-2.8.6-2.x86_64[test]
+>!> install ctags-2005.12.8-2.x86_64[test]
+>!> install db-4.3.29-4.x86_64[test]
+>!> install emacs-21.3-210.x86_64[test]
+>!> install emacs-info-21.3-210.x86_64[test]
+>!> install filesystem-10.0.42-6.x86_64[test]
+>!> install fillup-1.42-107.x86_64[test]
+>!> install gdbm-1.8.3-233.x86_64[test]
+>!> install glibc-2.3.90-39.x86_64[test]
+>!> install glibc-32bit-2.3.90-40.x86_64[test]
+>!> install gzip-1.3.5-147.x86_64[test]
+>!> install info-4.8-12.x86_64[test]
+>!> install libacl-2.2.31-4.x86_64[test]
+>!> install libattr-2.4.24-4.x86_64[test]
+>!> install libgcc-4.1.0_20051230-3.x86_64[test]
+>!> install libstdc++-4.1.0_20051230-3.x86_64[test]
+>!> install libzio-0.1-7.x86_64[test]
+>!> install ncurses-5.5-4.x86_64[test]
+>!> install pam-0.99.2.1-5.x86_64[test]
+>!> install perl-5.8.7-7.x86_64[test]
+>!> install readline-5.1-5.x86_64[test]
+>!> install zlib-1.2.3-5.x86_64[test]
 >!> installs=25, upgrades=0, uninstalls=0
 >!> Installation Order:
->!> filesystem-10.0.42-6[test]
->!> glibc-2.3.90-39[test]
->!> ncurses-5.5-4[test]
->!> readline-5.1-5[test]
->!> bash-3.1-5[test]
->!> bzip2-1.0.3-6[test]
->!> cracklib-2.8.6-2[test]
->!> zlib-1.2.3-5[test]
->!> libzio-0.1-7[test]
->!> info-4.8-12[test]
->!> libattr-2.4.24-4[test]
->!> libacl-2.2.31-4[test]
->!> glibc-32bit-2.3.90-40[test]
->!> libgcc-4.1.0_20051230-3[test]
->!> libstdc++-4.1.0_20051230-3[test]
->!> db-4.3.29-4[test]
->!> pam-0.99.2.1-5[test]
->!> coreutils-5.93-6[test]
->!> ctags-2005.12.8-2[test]
->!> fillup-1.42-107[test]
->!> gzip-1.3.5-147[test]
->!> gdbm-1.8.3-233[test]
->!> perl-5.8.7-7[test]
->!> emacs-info-21.3-210[test]
->!> emacs-21.3-210[test]
+>!> filesystem-10.0.42-6.x86_64[test]
+>!> glibc-2.3.90-39.x86_64[test]
+>!> ncurses-5.5-4.x86_64[test]
+>!> readline-5.1-5.x86_64[test]
+>!> bash-3.1-5.x86_64[test]
+>!> bzip2-1.0.3-6.x86_64[test]
+>!> cracklib-2.8.6-2.x86_64[test]
+>!> zlib-1.2.3-5.x86_64[test]
+>!> libzio-0.1-7.x86_64[test]
+>!> info-4.8-12.x86_64[test]
+>!> libattr-2.4.24-4.x86_64[test]
+>!> libacl-2.2.31-4.x86_64[test]
+>!> glibc-32bit-2.3.90-40.x86_64[test]
+>!> libgcc-4.1.0_20051230-3.x86_64[test]
+>!> libstdc++-4.1.0_20051230-3.x86_64[test]
+>!> db-4.3.29-4.x86_64[test]
+>!> pam-0.99.2.1-5.x86_64[test]
+>!> coreutils-5.93-6.x86_64[test]
+>!> ctags-2005.12.8-2.x86_64[test]
+>!> fillup-1.42-107.x86_64[test]
+>!> gzip-1.3.5-147.x86_64[test]
+>!> gdbm-1.8.3-233.x86_64[test]
+>!> perl-5.8.7-7.x86_64[test]
+>!> emacs-info-21.3-210.x86_64[test]
+>!> emacs-21.3-210.x86_64[test]

diff --git a/testsuite/solver/data.deptestomatic/instorder-tests/exercise-stable-test.solution b/testsuite/solver/data.deptestomatic/instorder-tests/exercise-stable-test.solution
index cde5945..422f40e 100644 (file)
--- a/testsuite/solver/data.deptestomatic/instorder-tests/exercise-stable-test.solution
+++ b/testsuite/solver/data.deptestomatic/instorder-tests/exercise-stable-test.solution
@@ -1,31 +1,31 @@
 >!> Installing novell-groupwise-gwclient from channel test
 >!> Calculating installation order ...
 >!> Solution #1:
->!> install bash-3.1-5[test]
->!> install compat-libstdc++-5.0.7-7[test]
->!> install expat-1.95.8-6[test]
->!> install filesystem-10.0.42-6[test]
->!> install fontconfig-2.3.93.20051222-2[test]
->!> install freetype2-2.1.10-5[test]
->!> install glibc-2.3.90-34[test]
->!> install libgcc-4.1.0_20051221-4[test]
->!> install ncurses-5.5-4[test]
->!> install novell-groupwise-gwclient-7.0-20051122[test]
->!> install readline-5.1-5[test]
->!> install xorg-x11-libs-6.9.0-2[test]
->!> install zlib-1.2.3-5[test]
+>!> install bash-3.1-5.i586[test]
+>!> install compat-libstdc++-5.0.7-7.i586[test]
+>!> install expat-1.95.8-6.i586[test]
+>!> install filesystem-10.0.42-6.i586[test]
+>!> install fontconfig-2.3.93.20051222-2.i586[test]
+>!> install freetype2-2.1.10-5.i586[test]
+>!> install glibc-2.3.90-34.i586[test]
+>!> install libgcc-4.1.0_20051221-4.i586[test]
+>!> install ncurses-5.5-4.i586[test]
+>!> install novell-groupwise-gwclient-7.0-20051122.i386[test]
+>!> install readline-5.1-5.i586[test]
+>!> install xorg-x11-libs-6.9.0-2.i586[test]
+>!> install zlib-1.2.3-5.i586[test]
 >!> installs=13, upgrades=0, uninstalls=0
 >!> Installation Order:
->!> filesystem-10.0.42-6[test]
->!> glibc-2.3.90-34[test]
->!> ncurses-5.5-4[test]
->!> readline-5.1-5[test]
->!> bash-3.1-5[test]
->!> libgcc-4.1.0_20051221-4[test]
->!> compat-libstdc++-5.0.7-7[test]
->!> zlib-1.2.3-5[test]
->!> freetype2-2.1.10-5[test]
->!> expat-1.95.8-6[test]
->!> fontconfig-2.3.93.20051222-2[test]
->!> xorg-x11-libs-6.9.0-2[test]
->!> novell-groupwise-gwclient-7.0-20051122[test]
+>!> filesystem-10.0.42-6.i586[test]
+>!> glibc-2.3.90-34.i586[test]
+>!> ncurses-5.5-4.i586[test]
+>!> readline-5.1-5.i586[test]
+>!> bash-3.1-5.i586[test]
+>!> libgcc-4.1.0_20051221-4.i586[test]
+>!> compat-libstdc++-5.0.7-7.i586[test]
+>!> zlib-1.2.3-5.i586[test]
+>!> freetype2-2.1.10-5.i586[test]
+>!> expat-1.95.8-6.i586[test]
+>!> fontconfig-2.3.93.20051222-2.i586[test]
+>!> xorg-x11-libs-6.9.0-2.i586[test]
+>!> novell-groupwise-gwclient-7.0-20051122.i386[test]

diff --git a/testsuite/solver/data.deptestomatic/instorder-tests/ignore b/testsuite/solver/data.deptestomatic/instorder-tests/ignore
index 7512f07..e69de29 100644 (file)
--- a/testsuite/solver/data.deptestomatic/instorder-tests/ignore
+++ b/testsuite/solver/data.deptestomatic/instorder-tests/ignore
@@ -1,2 +0,0 @@
-exercise-preview4-test.xml
-exercise-stable-test.xml

diff --git a/testsuite/solver/data.deptestomatic/instorder-tests/xfail b/testsuite/solver/data.deptestomatic/instorder-tests/xfail
deleted file mode 100644 (file)
index f769fd1..0000000
--- a/testsuite/solver/data.deptestomatic/instorder-tests/xfail
+++ /dev/null
@@ -1,2 +0,0 @@
-exercise-stable-test.xml
-exercise-preview4-test.xml