From e9f22173e5a3b9ae57a3881fe24264a301bd49e3 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Thu, 2 Apr 2015 14:51:00 +0000
Subject: [PATCH] scripts: Merge r6132:6177 from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6178 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scripts/run-regression-tests | 8 --------
 scripts/specialize-patch     | 4 +++-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests
index f792254c4..96b7d74fc 100755
--- a/scripts/run-regression-tests
+++ b/scripts/run-regression-tests
@@ -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
diff --git a/scripts/specialize-patch b/scripts/specialize-patch
index dd0c842f2..f0b0e79ce 100755
--- a/scripts/specialize-patch
+++ b/scripts/specialize-patch
@@ -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)