From 5f7668e80a5450d3ebbc17946b5a38a5cb0ef2c5 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 29 Jul 2012 16:28:23 +0000
Subject: [PATCH] Merge directories scripts and nightly from trunk

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4441 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 nightly/conf/nightly.conf    |  6 ++---
 scripts/run-regression-tests | 45 ++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index 2134a3181..6c91b9206 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,11 +3,11 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-3.4.4          \
+3.4.6          \
 3.3.8-nc       \
-3.2.22-nc      \
+3.2.24-nc      \
 3.1.10-nc      \
-3.0.36-nc      \
+3.0.38-nc      \
 2.6.39.4-nc    \
 2.6.38.8-nc    \
 2.6.37.6-nc    \
diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests
index e9bef612b..2ff3a7ac5 100755
--- a/scripts/run-regression-tests
+++ b/scripts/run-regression-tests
@@ -356,6 +356,41 @@ function run_sparse {
   else
     echo FAILED
   fi
+
+  return 0
+}
+
+function run_smatch {
+  local k="$1"
+  local kver="$(kernel_version $1)"
+  local plevel="$(patchlevel $1)"
+  local outputfile="${outputdir}/smatch-$1-output.txt"
+  local subdir="$2"
+  local disable="CONFIG_DYNAMIC_DEBUG"
+  shift
+  shift
+
+  echo "Running smatch on the patched kernel in ${subdir} $@ ..."
+  if (cd "${outputdir}/linux-$k" &&
+      for c in $disable; do sed -i.tmp "s/^$c=y\$/$c=n/" .config; done &&
+      make -s oldconfig &&
+      make -s prepare &&
+      make -s scripts &&
+      if grep -q '^CONFIG_PPC=y$' .config; then LC_ALL=C make -k M=arch/powerpc/lib; fi &&
+      LC_ALL=C make -k CHECK="smatch -p=kernel" C=2 CF=-D__CHECK_ENDIAN__ M="${subdir}" "$@"
+    ) &> "${outputfile}"
+  then
+    local errors=$(grep -c ' error:' "${outputfile}")
+    local warnings=$(grep -c ' warning:' "${outputfile}")
+    echo "${errors} errors / ${warnings} warnings."
+    cat "${outputfile}" |
+      grep -E 'warning:|error:' |
+      sort |
+      uniq -c
+  else
+    echo FAILED
+  fi
+
   return 0
 }
 
@@ -498,6 +533,11 @@ if [ "$(type -p sparse)" = "" ]; then
   echo "See also http://www.kernel.org/pub/software/devel/sparse/."
 fi
 
+if [ "$(type -p smatch)" = "" ]; then
+  echo "Error: smatch has not yet been installed."
+  echo "See also http://smatch.sourceforge.net/."
+fi
+
 if ! mkdir -p "${outputdir}"; then
   if [ -e "${outputdir}" ]; then
     echo "Error: directory ${outputdir} already exists."
@@ -526,6 +566,7 @@ do
   ibmvio="false"
   run_checkpatch="true"
   run_sparse="true"
+  run_smatch="true"
   global_multiple_patches="${multiple_patches}"
   while [ "${kv%-?}" != "${kv}" -o "${kv%-??}" != "${kv}" ]; do
     kv_without_opt="${kv%-?}"
@@ -538,6 +579,7 @@ do
       '-i')  ibmvio="true";;
       '-nc') run_checkpatch="false";;
       '-ns') run_sparse="false";;
+      '-nm') run_smatch="false";;
       '-u')  generate_kernel_patch_options="-u";;
       '-p')  multiple_patches="true";;
       *)     echo "Error: unknown option ${kopt}."; exit 1;;
@@ -569,6 +611,9 @@ do
       fi
     fi
   fi
+  if [ "${run_smatch}" = "true" ]; then
+    run_smatch $k drivers/scst
+  fi
   compile_kernel $k drivers/scst
   if [ "${full_check}" = "true" ]; then
     run_headers_check $k