Author: aschnell Date: Thu Dec 17 16:09:14 2009 New Revision: 60140 URL: http://svn.opensuse.org/viewcvs/yast?rev=60140&view=rev Log: - used "testedfiles:" feature Modified: trunk/storage/storage/src/testsuite/run/runtest.sh trunk/storage/storage/src/testsuite/tests/empty1.out trunk/storage/storage/src/testsuite/tests/empty1.ycp trunk/storage/storage/src/testsuite/tests/empty2.out trunk/storage/storage/src/testsuite/tests/empty2.ycp trunk/storage/storage/src/testsuite/tests/empty3.out trunk/storage/storage/src/testsuite/tests/empty3.ycp trunk/storage/storage/src/testsuite/tests/empty4.out trunk/storage/storage/src/testsuite/tests/empty4.ycp trunk/storage/storage/src/testsuite/tests/empty5.out trunk/storage/storage/src/testsuite/tests/empty5.ycp trunk/storage/storage/src/testsuite/tests/empty6.out trunk/storage/storage/src/testsuite/tests/empty6.ycp trunk/storage/storage/src/testsuite/tests/half-empty1.out trunk/storage/storage/src/testsuite/tests/half-empty1.ycp trunk/storage/storage/src/testsuite/tests/reuse-home1.out trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp trunk/storage/storage/src/testsuite/tests/windows-only1.out trunk/storage/storage/src/testsuite/tests/windows-only1.ycp trunk/storage/storage/src/testsuite/tests/windows1.out trunk/storage/storage/src/testsuite/tests/windows1.ycp Modified: trunk/storage/storage/src/testsuite/run/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/run/runtest.sh?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/run/runtest.sh (original) +++ trunk/storage/storage/src/testsuite/run/runtest.sh Thu Dec 17 16:09:14 2009 @@ -77,11 +77,7 @@ rm -f "$file" } -dump_only() { - grep -E "^Dump" | sed "s/^Dump\t//" -} - -( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse | dump_only >"$2" 2>"$3" +( $Y2BASE -l - -c "$logconf" $OPTIONS "$1" UI 2>&1 ) | parse >"$2" 2>"$3" retcode="$PIPESTATUS" if [ "$retcode" -gt 0 ]; then Modified: trunk/storage/storage/src/testsuite/tests/empty1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty1.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty1.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty1.out Thu Dec 17 16:09:14 2009 @@ -1,3 +1,3 @@ -Proposal: -Create swap partition /dev/sda1 (517.72 MB) -Create root partition /dev/sda2 (297.58 GB) with ext4 +Dump Proposal: +Dump Create swap partition /dev/sda1 (517.72 MB) +Dump Create root partition /dev/sda2 (297.58 GB) with ext4 Modified: trunk/storage/storage/src/testsuite/tests/empty1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty1.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty2.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty2.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty2.out Thu Dec 17 16:09:14 2009 @@ -1,4 +1,4 @@ -Proposal: -Create swap partition /dev/sda1 (2.01 GB) -Create root partition /dev/sda2 (20.00 GB) with ext4 -Create partition /dev/sda3 (276.08 GB) for /home with ext4 +Dump Proposal: +Dump Create swap partition /dev/sda1 (2.01 GB) +Dump Create root partition /dev/sda2 (20.00 GB) with ext4 +Dump Create partition /dev/sda3 (276.08 GB) for /home with ext4 Modified: trunk/storage/storage/src/testsuite/tests/empty2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty2.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty2.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty2.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty3.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty3.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty3.out Thu Dec 17 16:09:14 2009 @@ -1,6 +1,6 @@ -Proposal: -Create boot partition /dev/sda1 (70.60 MB) with ext4 -Create partition /dev/sda2 (29.99 GB) with id=8E -Create volume group system from /dev/sda2 [destructive] -Create logical volume /dev/system/root (10.00 GB) for / with ext4 -Create swap logical volume /dev/system/swap (512.00 MB) +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (29.99 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (512.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty3.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty3.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty3.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty4.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty4.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty4.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty4.out Thu Dec 17 16:09:14 2009 @@ -1,7 +1,7 @@ -Proposal: -Create boot partition /dev/sda1 (70.60 MB) with ext4 -Create partition /dev/sda2 (29.99 GB) with id=8E -Create volume group system from /dev/sda2 [destructive] -Create logical volume /dev/system/home (19.49 GB) for /home with ext4 -Create logical volume /dev/system/root (10.00 GB) for / with ext4 -Create swap logical volume /dev/system/swap (512.00 MB) +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (29.99 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/home (19.49 GB) for /home with ext4 +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (512.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty4.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty4.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty4.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty5.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty5.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty5.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty5.out Thu Dec 17 16:09:14 2009 @@ -1,6 +1,6 @@ -Proposal: -Create boot partition /dev/sda1 (70.60 MB) with ext4 -Create partition /dev/sda2 (298.02 GB) with id=8E -Create volume group system from /dev/sda2 [destructive] -Create logical volume /dev/system/root (10.00 GB) for / with ext4 -Create swap logical volume /dev/system/swap (768.00 MB) +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (298.02 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (768.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty5.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty5.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty5.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty5.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/empty6.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty6.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty6.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty6.out Thu Dec 17 16:09:14 2009 @@ -1,7 +1,7 @@ -Proposal: -Create boot partition /dev/sda1 (70.60 MB) with ext4 -Create partition /dev/sda2 (298.02 GB) with id=8E -Create volume group system from /dev/sda2 [destructive] -Create logical volume /dev/system/home (25.00 GB) for /home with ext4 -Create logical volume /dev/system/root (10.00 GB) for / with ext4 -Create swap logical volume /dev/system/swap (768.00 MB) +Dump Proposal: +Dump Create boot partition /dev/sda1 (70.60 MB) with ext4 +Dump Create partition /dev/sda2 (298.02 GB) with id=8E +Dump Create volume group system from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/home (25.00 GB) for /home with ext4 +Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 +Dump Create swap logical volume /dev/system/swap (768.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty6.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/empty6.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty6.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/empty6.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/half-empty1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/half-empty1.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/half-empty1.out (original) +++ trunk/storage/storage/src/testsuite/tests/half-empty1.out Thu Dec 17 16:09:14 2009 @@ -1,5 +1,5 @@ -Proposal: -Create extended partition /dev/sda3 (147.09 GB) -Create swap partition /dev/sda5 (2.01 GB) -Create root partition /dev/sda6 (20.00 GB) with ext4 -Create partition /dev/sda7 (125.08 GB) for /home with ext4 +Dump Proposal: +Dump Create extended partition /dev/sda3 (147.09 GB) +Dump Create swap partition /dev/sda5 (2.01 GB) +Dump Create root partition /dev/sda6 (20.00 GB) with ext4 +Dump Create partition /dev/sda7 (125.08 GB) for /home with ext4 Modified: trunk/storage/storage/src/testsuite/tests/half-empty1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/half-empty1.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/half-empty1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/half-empty1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/reuse-home1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/reuse-home1.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/reuse-home1.out (original) +++ trunk/storage/storage/src/testsuite/tests/reuse-home1.out Thu Dec 17 16:09:14 2009 @@ -1,4 +1,4 @@ -Proposal: -Format partition /dev/sda2 (15.01 GB) for / with ext4 [destructive] -Use /dev/sda1 as swap -Set mount point of /dev/sda3 to /home +Dump Proposal: +Dump Format partition /dev/sda2 (15.01 GB) for / with ext4 [destructive] +Dump Use /dev/sda1 as swap +Dump Set mount point of /dev/sda3 to /home Modified: trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/reuse-home1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/windows-only1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/windows-only1.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows-only1.out (original) +++ trunk/storage/storage/src/testsuite/tests/windows-only1.out Thu Dec 17 16:09:14 2009 @@ -1,6 +1,6 @@ -Proposal: -Shrink Windows partition /dev/sda1 to 33.21 GB [destructive] -Create extended partition /dev/sda2 (41.32 GB) -Create swap partition /dev/sda5 (517.72 MB) -Create root partition /dev/sda6 (16.50 GB) with ext4 -Create partition /dev/sda7 (24.31 GB) for /home with ext4 +Dump Proposal: +Dump Shrink Windows partition /dev/sda1 to 33.21 GB [destructive] +Dump Create extended partition /dev/sda2 (41.32 GB) +Dump Create swap partition /dev/sda5 (517.72 MB) +Dump Create root partition /dev/sda6 (16.50 GB) with ext4 +Dump Create partition /dev/sda7 (24.31 GB) for /home with ext4 Modified: trunk/storage/storage/src/testsuite/tests/windows-only1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/windows-only1.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows-only1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/windows-only1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; Modified: trunk/storage/storage/src/testsuite/tests/windows1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/windows1.out?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows1.out (original) +++ trunk/storage/storage/src/testsuite/tests/windows1.out Thu Dec 17 16:09:14 2009 @@ -1,6 +1,6 @@ -Proposal: -Create extended partition /dev/sda2 (34.52 GB) -Create swap partition /dev/sda5 (517.72 MB) -Create root partition /dev/sda6 (15.01 GB) with ext4 -Create partition /dev/sda7 (19.01 GB) for /home with ext4 -Set mount point of /dev/sda1 to /windows/C +Dump Proposal: +Dump Create extended partition /dev/sda2 (34.52 GB) +Dump Create swap partition /dev/sda5 (517.72 MB) +Dump Create root partition /dev/sda6 (15.01 GB) with ext4 +Dump Create partition /dev/sda7 (19.01 GB) for /home with ext4 +Dump Set mount point of /dev/sda1 to /windows/C Modified: trunk/storage/storage/src/testsuite/tests/windows1.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/tests/windows1.ycp?rev=60140&r1=60139&r2=60140&view=diff ============================================================================== --- trunk/storage/storage/src/testsuite/tests/windows1.ycp (original) +++ trunk/storage/storage/src/testsuite/tests/windows1.ycp Thu Dec 17 16:09:14 2009 @@ -1,3 +1,4 @@ +// testedfiles: helper1b.ycp { include "./lib/setup-system.ycp"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org