poldek: poldek/tests/sh/07-depsolver - more tests

[mis]

Author: mis                          Date: Mon May 12 20:32:42 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- more tests

---- Files affected:
poldek/poldek/tests/sh:
   07-depsolver (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: poldek/poldek/tests/sh/07-depsolver
diff -u poldek/poldek/tests/sh/07-depsolver:1.7 poldek/poldek/tests/sh/07-depsolver:1.8
--- poldek/poldek/tests/sh/07-depsolver:1.7	Mon May 12 17:48:53 2008
+++ poldek/poldek/tests/sh/07-depsolver	Mon May 12 22:32:37 2008
@@ -56,7 +56,7 @@
   
   params=""
   [ $# -gt 0 ] && params="$@";  
-  if [ -z "$VERBOSE" ]; then
+  if [ "$VERBOSE" != "-v -v" ]; then
       eval ./build-test-rpm.sh -d $destdir -n $name -v $version $params >/dev/null 2>&1 || fail "build package $name failed"
   else    
       eval ./build-test-rpm.sh -d $destdir -n $name -v $version $params
@@ -383,4 +383,39 @@
     POLDEK_TESTING_WITH_SUGGESTS=""
 }
 
+# https://bugs.pld-linux.org/show_bug.cgi?id=117
+testMultilibCandidatesAssertion() {
+    ORIG_POLDEK_INSTALL="$POLDEK_INSTALL"
+    POLDEK_INSTALL="$POLDEK_INSTALL -Omultilib=1"
+
+    msgn "Preparing repositories..."
+    i=i686
+    build a 2-2 -a $i -r "'a-misc = 2-2'" -f "/hello.$i"
+    build a-misc 2-2 -a $i -r "'a = 2-2'" -f "/sbin/hello.$i"
+
+    i=x86-64
+    build2 a 2-2 -a $i -r "'a-misc = 2-2'" -f "/hello.$i"
+    build2 a-misc 2-2 -a $i -r "'a = 2-2'" -f "/sbin/hello.$i"
+
+    for i in i686 x86-64; do 
+        build_installed a 1-1 -a $i -f "/hello.$i"
+        build_installed a-misc 1-1 -a $i -r "'a = 1-1'" -f "/sbin/hello.$i"
+    done    
+    try_install a-2-2.x86-64 "a-2-2.x86-64,a-misc-2-2.x86-64" "a-1-1.x86-64,a-misc-1-1.x86-64"
+    POLDEK_INSTALL="$ORIG_POLDEK_INSTALL"
+}
+
+# NFY
+testMultilibArchToNoarchUpgrade() {
+    ORIG_POLDEK_INSTALL="$POLDEK_INSTALL"
+    POLDEK_INSTALL="$POLDEK_INSTALL -Omultilib=1"
+
+    msgn "Preparing repositories..."
+    build_installed a 1-1 -a x86-64 -f "/hello.x86-64"
+    build a 2-2 -a noarch -f "/hello.sh"
+    try_install a-2-2.noarch "a-2-2.noarch" "a-1-1.x86-64"
+    POLDEK_INSTALL="$ORIG_POLDEK_INSTALL"
+}
+
+
 . ./sh/lib/shunit2
\ No newline at end of file
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/tests/sh/07-depsolver?r1=1.7&r2=1.8&f=u