From b97a6bbbf268f8c07ec526d2b23c863e9e65b96d Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 12 Jun 2010 05:55:48 +0000 Subject: [PATCH] Don't run patch -p1 --dry-run on the generated kernel patch because this fails for patches that depend on each other, e.g. the fcst in-tree patches. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1764 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/run-regression-tests | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests index a50550eb7..e66fff87a 100755 --- a/scripts/run-regression-tests +++ b/scripts/run-regression-tests @@ -300,26 +300,6 @@ function generate_kernel_patch { $2 $1 > "${patchfile_m}" } -# Test whether the generated kernel patch applies cleanly to kernel version $1. -# Leaves a vanilla kernel tree in directory "${outputdir}/linux-$1" at exit. -function test_if_patch_applies_cleanly { - local kver="$(kernel_version $1)" - local plevel="$(patchlevel $1)" - local outputfile="${outputdir}/kernel-$1-patch-output.txt" - local patchfile="${outputdir}/scst-$1-kernel.patch" - local rc=0 - - echo "Testing whether the generated kernel patch applies cleanly ..." - ( cd "${outputdir}" && extract_kernel_tree "$1" ) - ( cd "${outputdir}/linux-$1" \ - && patch -p1 --dry-run -f < "${patchfile}" &> "${outputfile}" ) - if [ $? != 0 ]; then - echo "FAILED" - rc=1 - fi - return $rc -} - # Run checkpatch on the generated kernel patch. Assumes that there is a # vanilla kernel tree present in directory "${outputdir}/linux-$1", and leaves # this kernel tree clean. @@ -604,7 +584,7 @@ do download_kernel $k || continue generate_kernel_patch $k "${generate_kernel_patch_options}" || continue - test_if_patch_applies_cleanly $k || continue + ( cd "${outputdir}" && extract_kernel_tree $k ) || continue if [ "${run_checkpatch}" = "true" ]; then run_checkpatch $k fi