Mailinglist Archive: yast-commit (553 mails)

[aschnell@xxxxxxxxxxxxxxxx]

Author: aschnell
Date: Mon Dec 21 12:45:37 2009
New Revision: 60156

URL: http://svn.opensuse.org/viewcvs/yast?rev=60156&view=rev
Log:
- don't override Makefile.am
- extended runtest.sh

Modified:
    trunk/testsuite/VERSION
    trunk/testsuite/package/yast2-testsuite.changes
    trunk/testsuite/skel/Makefile.testsuite.in
    trunk/testsuite/skel/runtest.sh
    trunk/testsuite/yast2-testsuite.spec.in

Modified: trunk/testsuite/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/VERSION?rev=60156&r1=60155&r2=60156&view=diff
==============================================================================
--- trunk/testsuite/VERSION (original)
+++ trunk/testsuite/VERSION Mon Dec 21 12:45:37 2009
@@ -1 +1 @@
-2.17.0
+2.19.0

Modified: trunk/testsuite/package/yast2-testsuite.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/package/yast2-testsuite.changes?rev=60156&r1=60155&r2=60156&view=diff
==============================================================================
--- trunk/testsuite/package/yast2-testsuite.changes (original)
+++ trunk/testsuite/package/yast2-testsuite.changes Mon Dec 21 12:45:37 2009
@@ -1,8 +1,14 @@
 -------------------------------------------------------------------
+Mon Dec 21 12:07:52 CET 2009 - aschnell@xxxxxxx
+
+- don't override Makefile.am
+- extended runtest.sh
+- 2.19.0
+
+-------------------------------------------------------------------
 Fri Dec 11 16:07:09 CET 2009 - aschnell@xxxxxxx
 
 - run all tests even if some fail
-- 2.17.0
 
 -------------------------------------------------------------------
 Mon Jun 29 12:19:01 CEST 2009 - mvidner@xxxxxxx

Modified: trunk/testsuite/skel/Makefile.testsuite.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/skel/Makefile.testsuite.in?rev=60156&r1=60155&r2=60156&view=diff
==============================================================================
--- trunk/testsuite/skel/Makefile.testsuite.in (original)
+++ trunk/testsuite/skel/Makefile.testsuite.in Mon Dec 21 12:45:37 2009
@@ -14,7 +14,7 @@
 files_config=$(srcdir)/config/default.exp $(srcdir)/config/unix.exp 
$(srcdir)/config/unknown.exp
 files_run=$(srcdir)/run/runtest.sh
 files_test=$(srcdir)/$(RPMNAME).test/testsuite.exp
-files_tmpl=$(srcdir)/Makefile.am
+#files_tmpl=$(srcdir)/Makefile.am
 files_all=$(files_config) $(files_test) $(files_tmpl) $(files_run)
 
 all: $(files_all) $(testsuite_dirs)
@@ -28,8 +28,8 @@
 # Overwrite the tested package's testsuite/Makefile.am only
 # if the template file is newer in content (which shouldn't
 # happen as it is only a proxy). Prevents automake mismatch errors.
-$(srcdir)/Makefile.am: $(skeldir)/Makefile_am
-       cmp -s $< $@ || cp -f $< $@
+#$(srcdir)/Makefile.am: $(skeldir)/Makefile_am
+#      cmp -s $< $@ || cp -f $< $@
 
 $(srcdir)/run/runtest.sh: $(skeldir)/runtest.sh run
        cp -f $< $@

Modified: trunk/testsuite/skel/runtest.sh
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/skel/runtest.sh?rev=60156&r1=60155&r2=60156&view=diff
==============================================================================
--- trunk/testsuite/skel/runtest.sh (original)
+++ trunk/testsuite/skel/runtest.sh Mon Dec 21 12:45:37 2009
@@ -77,7 +77,7 @@
   rm -f "$file"
 }
 
-( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3"
+( Y2DIR=$Y2DIR:$Y2BASE_Y2DIR LD_LIBRARY_PATH=$Y2BASE_LD_LIBRARY_PATH $Y2BASE 
-l - -c "$logconf" $Y2BASEFLAGS $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3"
 
 retcode="$PIPESTATUS"
 if [ "$retcode" -gt 0 ]; then

Modified: trunk/testsuite/yast2-testsuite.spec.in
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/yast2-testsuite.spec.in?rev=60156&r1=60155&r2=60156&view=diff
==============================================================================
--- trunk/testsuite/yast2-testsuite.spec.in (original)
+++ trunk/testsuite/yast2-testsuite.spec.in Mon Dec 21 12:45:37 2009
@@ -6,7 +6,7 @@
 BuildRequires: openslp-devel perl-XML-Writer popt-devel yast2-core-devel 
yast2-devtools yast2-ycp-ui-bindings
 Requires:      expect dejagnu
 # y2base -I includepath -M modulepath
-Requires:      yast2-core >= 2.16.45
+Requires:      yast2-core >= 2.19.0
 Summary:       YaST2 - Testsuite
 
 BuildArchitectures: noarch

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx