mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-20 06:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Merge r6132:6177 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6178 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-04-02 14:51:00 +00:00
parent fc51102b1a
commit e9f22173e5
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/run-regression-tests
-8
View File
@@ -278,14 +278,6 @@ CONFIG_TRACING CONFIG_X86_32 \
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" &&
for c in $disable; do sed -i.tmp "s/^$c=[ym]\$/$c=n/" .config; done &&
make -s oldconfig &>/dev/null
scripts/specialize-patch
+3 -1
View File
@@ -227,7 +227,7 @@ function evaluate(stmnt, pattern, arg, op, result) {
stmnt = "+#if " (op[2] != 0 ? op[1] : op[2])
}
pattern="^+#if[[:blank:]]*(!*[[:blank:]]*[A-Za-z_]*[[:blank:]]*)\\&\\&[[:blank:]]*([01])[[:blank:]]*$"
pattern="^+#if[[:blank:]]*(!*[[:blank:]]*[A-Za-z_]*)[[:blank:]]*\\&\\&[[:blank:]]*([01])[[:blank:]]*$"
while (match(stmnt, pattern, op) != 0)
{
stmnt = "+#if " (op[2] != 0 ? op[1] : op[2])
@@ -561,6 +561,8 @@ BEGIN {
delete_next_blank_line = 0
if (match($0, "^+ *#"))
{
if (debug)
printf "/* debug specialize-patch: line %d: %s*/\n", NR, $0
process_preprocessor_statement()
}
else if (output)