From af0a496e5723942bc293ad8960a27e046ca27467 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 10 Apr 2011 10:51:58 +0000 Subject: [PATCH] Added the srpt pre-cflags patch to the nightly build. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3372 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/run-regression-tests | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests index 7441fe7f6..5e3c4236a 100755 --- a/scripts/run-regression-tests +++ b/scripts/run-regression-tests @@ -355,11 +355,13 @@ function run_checkpatch { } function patch_and_configure_kernel { + local kver="$(kernel_version $1)" local patchfile="${outputdir}/scst-$1-kernel-matching-line-numbers.patch" local patchoutput="${outputdir}/patch-command-output-$1.txt" echo "Patching and configuring kernel ..." ( + local srcdir="$PWD" cd "${outputdir}/linux-$1" \ && if [ "${multiple_patches}" = "false" ]; then patch -p1 -f -s <"${patchfile}" >"${patchoutput}" @@ -371,6 +373,14 @@ function patch_and_configure_kernel { patch -p1 -f -s <"${p}" >>"${patchoutput}" 2>&1 done fi \ + && if [ -e $srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch ]; then + echo "$srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch ..." \ + >>"${patchoutput}" + patch -p1 -f -s <$srcdir/srpt/patches/kernel-${kver}-pre-cflags.patch \ + >>"${patchoutput}"; + else + echo "srpt/patches/kernel-${kver}-pre-cflags.patch not found."; \ + fi \ && make -s allmodconfig &>"${outputdir}/make-config-output.txt" \ && sed -i.tmp 's/^CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y$/CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=n/' .config \ && for c in CONFIG_BINARY_PRINTF CONFIG_BLK_DEV_IO_TRACE CONFIG_BRANCH_PROFILE_NONE CONFIG_CONTEXT_SWITCH_TRACER CONFIG_DYNAMIC_FTRACE CONFIG_EVENT_TRACE_TEST_SYSCALLS CONFIG_EVENT_TRACING CONFIG_FTRACE CONFIG_FTRACE_MCOUNT_RECORD CONFIG_FTRACE_NMI_ENTER CONFIG_FTRACE_SELFTEST CONFIG_FTRACE_STARTUP_TEST CONFIG_FTRACE_SYSCALLS CONFIG_FUNCTION_GRAPH_TRACER CONFIG_FUNCTION_PROFILER CONFIG_FUNCTION_TRACER CONFIG_GENERIC_TRACER CONFIG_HAVE_FTRACE_NMI_ENTER CONFIG_IRQSOFF_TRACER CONFIG_IWLWIFI_DEVICE_TRACING CONFIG_IWM_TRACING CONFIG_KVM_MMU_AUDIT CONFIG_MAC80211_DRIVER_API_TRACER CONFIG_MMIOTRACE CONFIG_NET_DROP_MONITOR CONFIG_NOP_TRACER CONFIG_SCHED_TRACER CONFIG_STACK_TRACER CONFIG_TRACEPOINTS CONFIG_TRACER_MAX_TRACE CONFIG_TRACING; do sed -i.tmp "s/^$c=y\$/$c=n/" .config; done \