update tests

tests/test_cget_depends.sh

@@ -5,6 +5,10 @@
 load_mod alt
 
 #testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/CentOS/6/nxclient-*.i586.rpm)
-testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/ALTLinux/Sisyphus/rx-etersoft-*.i586.rpm)
+#testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/CentOS/5/nxclient-*.i586.rpm)
+testfile=$(echo /var/ftp/pub/Etersoft/WINE@Etersoft/2.0-testing/WINE/ALTLinux/Sisyphus/wine-etersoft-*.i586.rpm)
+#testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/ALTLinux/Sisyphus/rx-etersoft-*.i586.rpm)
 REQLIST="$(get_rpmpkg_requires -p "$testfile")"
+echo $REQLIST
+echo "---"
 trans_rpmdeps_to_pkgname $REQLIST

tests/test_extra_apt.sh

+#!/bin/bash
+
+# load common functions, compatible with local and installed script
+. `dirname $0`/../share/eterbuild/functions/common
+load_mod alt
+
+REQLIST="bash /bin/sh coreutils curl diffutils eject /etc/rc.d/init.d /etc/udev/rules.d findutils fonts-ttf-core glibc-locales glibc-nss glibc-pthread grep gzip less libasound.so.2 libc.so.6 libcups libdl.so.2 libfontconfig.so.1 libfreetype.so.6 libglib-2.0.so.0 libgmodule-2.0.so.0 libgobject-2.0.so.0 libgstapp-0.10.so.0 libgstreamer-0.10.so.0 libgthread-2.0.so.0 libICE libieee1284.so.3 liblber-2.4.so.2 liblcms.so.1 libldap_r-2.4.so.2 /lib/ld-linux.so.2 libmpg123.so.0 libm.so.6 libncurses libopenal.so.1 libpthread.so.0 libresolv.so.2 libSM.so.6 libssl libudev.so.0 libusb-1.0.so.0 libuuid libX11.so.6 libXext.so.6 libxml2.so.2 libXpm.so.4 libXrender libz.so.1 mount perl-base procps psmisc rtld /sbin/modprobe sed sh tar termutils unzip /usr/bin/env /usr/sbin/groupadd /usr/sbin/post_service /usr/sbin/preun_service webclient wget which xdg-utils xlsfonts xrandr xz"
+#REQLIST="bash /bin/sh coreutils curl diffutils eject /etc/rc.d/init.d /etc/udev/rules.d findutils glibc-locales glibc-nss glibc-pthread grep gzip less libasound.so.2 libc.so.6 libcups libdl.so.2 libfontconfig.so.1 libfreetype.so.6 libglib-2.0.so.0 libgmodule-2.0.so.0 libgobject-2.0.so.0 libgstapp-0.10.so.0 libgstreamer-0.10.so.0 libgthread-2.0.so.0 libICE libieee1284.so.3 liblber-2.4.so.2 liblcms.so.1 libldap_r-2.4.so.2 /lib/ld-linux.so.2 libmpg123.so.0 libm.so.6 libncurses libopenal.so.1 libpthread.so.0 libresolv.so.2 libSM.so.6 libssl libudev.so.0 libusb-1.0.so.0 libuuid libX11.so.6 libXext.so.6 libxml2.so.2 libXpm.so.4 libXrender libz.so.1 mount perl-base procps psmisc rtld /sbin/modprobe sed sh tar termutils unzip /usr/bin/env /usr/sbin/groupadd /usr/sbin/post_service /usr/sbin/preun_service webclient wget which xdg-utils xlsfonts xrandr xz"
+
+LANG=C apt-get -m install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u

tests/test_tr_srpm.sh

@@ -2,6 +2,7 @@
 
 . `dirname $0`/../share/eterbuild/functions/common
 . $ETERBUILDDIR/functions/rpm
+. $ETERBUILDDIR/functions/buildsrpm
 
 install_srpm_package()
 {
@@ -16,16 +17,17 @@ pack_srpm_package()
 export IGNOREGEAR=1
 
 RPMTOPDIR=$RPMDIR/BP
+SRPMSDIR=/var/ftp/pub/Etersoft/Sisyphus/sources
 
-for i in `ls -1 $RPMDIR/SRPMS` ; do
-	PKGNAME=$RPMDIR/SRPMS/$i
-	echo "get for $i:"
+for PKGNAME in `ls -1 $SRPMSDIR/it*` ; do
+	test -f $PKGNAME || continue
+	echo "get for $PKGNAME:"
 	install_srpm_package $PKGNAME
 	SPECNAME=$RPMTOPDIR/SPECS/$(spec_by_srpm $PKGNAME)
 	echo "spec: $SPECNAME"
 	pack_srpm_package $SPECNAME
 	echo Compare $PKGNAME $LISTBUILT
 	# what the package with rpmdiff?
-	rpmdiff $PKGNAME $RPMTOPDIR/SRPMS/$LISTBUILT
+	rpmdiff $PKGNAME $LISTBUILT
 	exit 1
 done