Mailinglist Archive: yast-commit (288 mails)

[fehr@xxxxxxxxxxxxxxxxx]

Author: fehr
Date: Tue May 17 13:03:04 2011
New Revision: 64006

URL: http://svn.opensuse.org/viewcvs/yast?rev=64006&view=rev
Log:
- backport changes by Arvin needed for ycp testsuite in storage
- don't override Makefile.am
- extended runtest.sh
- run all tests even if some fail
- 2.17.0

Modified:
    branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION
    branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes
    branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in
    branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh
    branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp

Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION?rev=64006&r1=64005&r2=64006&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/testsuite/VERSION Tue May 17 13:03:04 2011
@@ -1 +1 @@
-2.16.2
+2.17.0

Modified: 
branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes?rev=64006&r1=64005&r2=64006&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/testsuite/package/yast2-testsuite.changes 
Tue May 17 13:03:04 2011
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Tue May 17 11:16:32 CEST 2011 - fehr@xxxxxxx
+
+- backport changes by Arvin needed for ycp testsuite in storage
+- don't override Makefile.am
+- extended runtest.sh
+- run all tests even if some fail
+- 2.17.0
+
+-------------------------------------------------------------------
 Tue Apr  8 13:09:41 CEST 2008 - mvidner@xxxxxxx
 
 - Enable make check before make install, by telling y2base to search

Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in?rev=64006&r1=64005&r2=64006&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in 
(original)
+++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/Makefile.testsuite.in Tue 
May 17 13:03:04 2011
@@ -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 $(srcdir)/.cvsignore
+files_tmpl=$(srcdir)/.cvsignore
 files_all=$(files_config) $(files_test) $(files_tmpl) $(files_run)
 
 all: $(files_all) $(testsuite_dirs)
@@ -28,11 +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)/.cvsignore: $(skeldir)/_cvsignore
-       cp -f $< $@
+#$(srcdir)/Makefile.am: $(skeldir)/Makefile_am
+#      cmp -s $< $@ || cp -f $< $@
 
 $(srcdir)/run/runtest.sh: $(skeldir)/runtest.sh run
        cp -f $< $@

Modified: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh?rev=64006&r1=64005&r2=64006&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh (original)
+++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/runtest.sh Tue May 17 
13:03:04 2011
@@ -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: branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp?rev=64006&r1=64005&r2=64006&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp (original)
+++ branches/SuSE-Code-11-SP1-Branch/testsuite/skel/testsuite.exp Tue May 17 
13:03:04 2011
@@ -19,10 +19,6 @@
 
 puts "\nChecking started\n"
 
-foreach file $filenames {
-  if {[testsuite-run $file] < 0} {
-    return
-  }
-}
+foreach file $filenames { testsuite-run $file }
 
 puts "\nChecking finished\n"

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