add tests

tests/specpkgr.spec.in

@@ -30,9 +30,20 @@ BuildRequires: imake, xorg-cf-files libxml2-devel gccmakedep
 
 %def_with krb
 
+Conflicts: wine-vanilla wine
+
+# FIXME:
+# Runtime linked
+Requires: libcups
+Requires: libXrender libXi libXext libX11 libICE libXcomposite libXcursor libXinerama libXrandr
+
 %{?_with_krb:Requires: libkrb5-devel}
 #Requires: libkrb5-devel
 
+%if_with test
+BuildRequires: python3-module-test
+%endif
+
 
 Source: %name.source
 

tests/test_pkgrepl.sh

@@ -25,8 +25,8 @@ check()
 
 
 LISTBUILDDEP=`print_buildreq $SPECNAME`
-check "BuildDep" "imake xorg-cf-files libxml2-devel gccmakedep rpm-build-compat gcc4.1 gcc" "$LISTBUILDDEP"
+check "BuildDep" "imake xorg-cf-files libxml2-devel gccmakedep python3-module-test rpm-build-compat gcc4.1 gcc" "$LISTBUILDDEP"
 
 echo -
 LISTREQDEP=`print_pkgreq $SPECNAME`
-check "Reqs" "binutils dbus-tools-gui expect foomatic-db-engine libkrb5-devel libstdc++ netcat nx openssl /usr/bin/xvt Xdialog" "$LISTREQDEP"
+check "Reqs" "binutils dbus-tools-gui expect foomatic-db-engine libcups libkrb5-devel libstdc++ libXrender libXi libXext libX11 libICE libXcomposite libXcursor libXinerama libXrandr netcat nx openssl /usr/bin/xvt Xdialog" "$LISTREQDEP"

tests/test_repl_find.sh

@@ -215,10 +215,10 @@ print_pkgrepl_list
 check_repl libxml2-devel "libxml2-dev"
 
 ############################# Astralinux ##########################
-BUILDNAME=wine
+BUILDNAME=wine-etersoft
 
 DISTRNAME=AstraLinux
-PKGVENDOR=AstraLinux
+PKGVENDOR=astra
 DISTRVERSION=orel
 BUILDARCH=x86_64
 #BUILDARCH=i586
@@ -230,6 +230,24 @@ print_pkgrepl_list
 
 check_repl pkg-config "pkgconfig"
 
+############################# Astralinux ##########################
+BUILDNAME=wine-etersoft
+
+DISTRNAME=AstraLinux
+PKGVENDOR=astra
+DISTRVERSION=orel
+BUILDARCH=x86_64
+TARGETARCH=i586
+PKGFORMAT=rpm
+
+echo
+echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
+print_pkgrepl_list
+
+check_repl pkg-config "pkgconfig:any"
+check_repl libXrender "libxrender:i386"
+check_repl libX11 "libx11:i386"
+
 ############################# ROSA ##########################
 BUILDNAME=wine
 

tests/test_specpkgrepl.sh

+#!/bin/sh
+
+if [ -n "$1" ] ; then
+    SPECNAME="$1"
+else
+    SPECNAME=specpkgr.spec
+    cp -f specpkgr.spec.in $SPECNAME
+fi
+
+VERBOSE=1 TARGETARCH=i586 BASEARCH=x86_64 DISTRNAME=AstraLinux DISTRVERSION=orel bash ../bin/rpmbps $SPECNAME

tests/transf_altdistrversion.sh

@@ -24,29 +24,22 @@ check_GN()
 }
 
 echo "Check get_altdistr_version"
-check_AD M40 4.0
-check_AD M30 3.0
-check_AD M41 4.1
 check_AD M50P p5
 check_AD M60T t6
-check_AD M51 5.1
 check_AD  SS sisyphus
 
 echo "Check get_altdist_mod"
-check_MOD 2.4 M24
-check_MOD 3.0 M30
-check_MOD 4.0 M40
-check_MOD 4.1 M41
-check_MOD 5.0 M50
-check_MOD 5.1 M51
 check_MOD  p5 M50P
 check_MOD  p6 M60P
 check_MOD  t6 M60T
-check_MOD Sisyphus SS
-check_MOD sisyphuS SS
+check_MOD  p9 M90P
+check_MOD  c9f2 c9f2
+check_MOD  c9 c9
+check_MOD  p10 p10
+check_MOD Sisyphus sisyphus
+check_MOD sisyphuS sisyphus
 
 check_GN M50P M50P
-check_GN 5.0 M50
 check_GN p5 M50P
 check_GN p6 M60P
 check_GN t6 M60T