Author: mvidner Date: Tue Apr 8 13:09:51 2008 New Revision: 46223 URL: http://svn.opensuse.org/viewcvs/yast?rev=46223&view=rev Log: Enable make check before make install, by telling y2base to search first in ../src (fate#2306). Modified: trunk/testsuite/VERSION trunk/testsuite/package/yast2-testsuite.changes trunk/testsuite/skel/runtest.sh trunk/testsuite/skel/unix.exp trunk/testsuite/yast2-testsuite.spec.in Modified: trunk/testsuite/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/VERSION?rev=46223&r1=46222&r2=46223&view=diff ============================================================================== --- trunk/testsuite/VERSION (original) +++ trunk/testsuite/VERSION Tue Apr 8 13:09:51 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/testsuite/package/yast2-testsuite.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/package/yast2-testsuite.changes?rev=46223&r1=46222&r2=46223&view=diff ============================================================================== --- trunk/testsuite/package/yast2-testsuite.changes (original) +++ trunk/testsuite/package/yast2-testsuite.changes Tue Apr 8 13:09:51 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 8 13:09:41 CEST 2008 - mvidner@suse.cz + +- Enable make check before make install, by telling y2base to search + first in ../src (fate#2306). +- 2.16.2 + +------------------------------------------------------------------- Fri Feb 29 10:17:09 CET 2008 - coolo@suse.de - fix buildrequires after yast2-core split Modified: trunk/testsuite/skel/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/skel/runtest.sh?rev=46223&r1=46222&r2=46223&view=diff ============================================================================== --- trunk/testsuite/skel/runtest.sh (original) +++ trunk/testsuite/skel/runtest.sh Tue Apr 8 13:09:51 2008 @@ -16,12 +16,6 @@ shift done -# but now y2base does not support them :-( -if [ "$OPTIONS" ]; then - echo "Options not supported yet, discarding '$OPTIONS'" >&2 - OPTIONS="" -fi - unset LANG unset LC_CTYPE unset LC_NUMERIC Modified: trunk/testsuite/skel/unix.exp URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/skel/unix.exp?rev=46223&r1=46222&r2=46223&view=diff ============================================================================== --- trunk/testsuite/skel/unix.exp (original) +++ trunk/testsuite/skel/unix.exp Tue Apr 8 13:09:51 2008 @@ -47,12 +47,22 @@ set tmperr_name "tmp.err.$base_name" set tmplog_name "tmp.log.$base_name" + # fate#2306: enable make check *gasp* before make install + # by searching in the source directory + set options "" + # first hack: look for the usual suspects + # (next steps: use YCPCFLAGS) + set sourcedir "../src" + if {[file isdirectory $sourcedir]} { + set options "-I $sourcedir -M $sourcedir" + } + puts "Running $base_name ..." # run the test set result "" - set oops [catch { set result [exec "run/runtest.sh" "$test_input" "$tmpout_name" "$tmperr_name" ] } catched] + set oops [catch { set result [exec "run/runtest.sh" $options "$test_input" "$tmpout_name" "$tmperr_name" ] } catched] if {$oops != 0} { fail "Test case failed for $base_name: $catched" Modified: trunk/testsuite/yast2-testsuite.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/yast2-testsuite.spec.in?rev=46223&r1=46222&r2=46223&view=diff ============================================================================== --- trunk/testsuite/yast2-testsuite.spec.in (original) +++ trunk/testsuite/yast2-testsuite.spec.in Tue Apr 8 13:09:51 2008 @@ -3,7 +3,8 @@ @HEADER@ BuildRequires: openslp-devel perl-XML-Writer popt-devel yast2-core-devel yast2-devtools yast2-ycp-ui-bindings Requires: expect dejagnu -Requires: yast2-core +# y2base -I includepath -M modulepath +Requires: yast2-core >= 2.16.45 Summary: YaST2 testsuite BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org