[svn-commits] tzafrir: branch 1.4 r4375 - /branches/1.4/build_tools/

SVN commits to the Digium repositories svn-commits at lists.digium.com
Sat Jun 28 16:19:35 CDT 2008


Author: tzafrir
Date: Sat Jun 28 16:19:34 2008
New Revision: 4375

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4375
Log:
build_tools/builder - a script that uses build_tools/test_kernel_git to
test-build various kernels.

test_kernel_git: small fixes. Mainly using 'make distclean' in setver.

Closes issue #12135 .

Added:
    branches/1.4/build_tools/builder   (with props)
Modified:
    branches/1.4/build_tools/   (props changed)
    branches/1.4/build_tools/test_kernel_git

Propchange: branches/1.4/build_tools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jun 28 16:19:34 2008
@@ -1,2 +1,3 @@
 menuselect-deps
 make_firmware_object
+git_test.conf

Added: branches/1.4/build_tools/builder
URL: http://svn.digium.com/view/zaptel/branches/1.4/build_tools/builder?view=auto&rev=4375
==============================================================================
--- branches/1.4/build_tools/builder (added)
+++ branches/1.4/build_tools/builder Sat Jun 28 16:19:34 2008
@@ -1,0 +1,168 @@
+#!/bin/sh
+
+# build_test - a build testing script
+#
+# Copyright (C) 2008 by Xorcom <support at xorcom.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# Setup:
+#
+# 0. Copy this script under build_tools/ and 
+#
+#     chmod +x build_tools/builder
+#
+# 1. Make sure you have git and sqlite3 installed. If the sqlite3 binary 
+#    is called differently, fix the line "SQLITE=" in the script or in 
+#    build_tools/test_build.conf .
+# 
+# 2. Run:
+#
+#   ./build_tools/test_kernel_git init /path/to/some/dir
+#
+# /path/to/some/dir must exist . This will download a recent kernel 
+# git repository to /path/to/some/dir/linux-2.6 . Use 
+# './build_tools/test_kernel_git update' to pull a fresh update there.
+# 
+# 3. Run:
+#
+#   ./build_tools/builder init
+#
+# 
+# Usage:
+#
+#   ./build_tools build
+#
+# The past results are in a sqlite database in the logs subdirectory. For 
+# a simple list of results:
+# 
+#   ./build_tools report
+#
+# You can also look at the build log for a specific build in the logs 
+# directory.
+
+BIN_DIR=`dirname $0`
+BASE_DIR=`dirname $BIN_DIR`
+SQLITE=sqlite3
+HOSTS="localhost"
+LOGS_DIR="$BASE_DIR/logs"
+DB=$LOGS_DIR/builds.db
+BUILD_SCRIPT=$BIN_DIR/test_kernel_git
+KERNELS_localhost="2.6.12 2.6.18 2.6.25"
+
+usage() {
+	me=`basename $0`
+	echo "$me: test building Zaptel/DAHDI with various kernels"
+	echo ""
+	echo "Usage: $0 command <optional parameters>"
+	echo "  init                Create results directory and database."
+	echo "  build [<kernels>]   Run the test builds. The default list: "
+	echo "                      $KERNELS_localhost"
+	echo "  report [<filter>]   Print all results [matching <filter>]"
+	echo "                      Default is to print all the resaults."
+	echo ""
+	echo "Filters:"
+	echo "   failed:          Only failed tests."
+	echo "   fail_type <type> Where fail_type matches <type>."
+	echo "   2.6*             Only builds for a matching kernel version."
+	echo "   Else:            Match a string from the build name, which "
+	echo "                    is essentially the time it started."
+	echo ""
+}
+
+set -e
+
+if [ -r $BIN_DIR/test_build.conf ]; then . $BIN_DIR/test_build.conf; fi
+
+# Runs the test script, logs the result, and fails if the test command 
+# has failed.
+build_and_check() {
+	test_name="$1"
+	test_cmd="$2"
+	log_file="$3"
+	results_str="$4"
+	fail_type=''
+
+	set +e
+	$BUILD_SCRIPT $test_cmd >$log_file 2>&1
+	rc=$?
+	set -e
+	if [ $rc != 0 ]; then
+		fail_type="$test_name"
+		echo "$results_str, $rc, '$fail_type', '$log_file');" | $SQLITE $DB
+	fi
+	return $rc
+}
+
+build_zaptel() {
+	build_name="$1"
+	host="$2"
+	kvers="$3"
+	log_base="build__${build_name}__${host}__${kvers}"
+	log_base_full="$LOGS_DIR/$log_base"
+	log_file="$log_base_full.log"
+	results_str="INSERT INTO results VALUES ('$build_name', '$host', '$kvers'"
+	# Due to 'set -e' a failed test exists the script.
+	build_and_check setver "setver $kvers" "$log_file" "$results_str"
+	build_and_check clean "test clean" "$log_file" "$results_str"
+	build_and_check build "build" "$log_file" "$results_str"
+
+	# If we got here, all was well.
+	echo "$results_str, 0, 'complete', '$log_file');" | $SQLITE $DB
+}
+
+case "$1" in
+init)
+	mkdir -p $LOGS_DIR
+	cat <<EOF | $SQLITE $DB
+CREATE TABLE runs(name TEXT PRIMARY KEY, time INTEGER DEFAULT CURRENT_TIMESTAMP, zap_ver TEXT);
+CREATE TABLE results(name TEXT, system TEXT, kvers TEXT, result INTEGER, fail_type TEXT, log TEXT);
+EOF
+	mkdir -p $LOGS_DIR
+	;;
+
+build)
+	cd $BASE_DIR
+	shift
+	if [ "$*" != '' ]; then KERNELS_localhost="$*"; fi
+	#make update
+	make version.h
+	zap_ver=`awk -F'"' '/ZAPTEL_VERSION/{print $2}' version.h`
+	build_name=`date '+%Y%m%d-%H%M%si'`
+	echo "INSERT INTO runs (name, zap_ver) VALUES ('$build_name', '$zap_ver');" | $SQLITE $DB
+
+	for host in $HOSTS; do
+		eval kernels="\$KERNELS_$host"
+		for kvers in $kernels; do
+			build_zaptel $build_name $host $kvers
+		done
+	done
+	;;
+report)
+	case "$2" in
+	'')   where='1=1' ;;
+	failed) where='result != 0' ;;
+	fail_type) where="fail_type like \"%$3%\"" ;;
+	2.6*) where="kvers like \"$2%\"" ;;
+	*)    where="name like \"%$2%\"" ;;
+	esac
+
+	echo "select * from results where $where;" | $SQLITE $DB
+	;;
+*)
+	usage
+	echo >&2 "$0: Unknown command '$1'. Aborting."
+	exit 1
+esac

Propchange: branches/1.4/build_tools/builder
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: branches/1.4/build_tools/builder
------------------------------------------------------------------------------
    svn:executable = *

Propchange: branches/1.4/build_tools/builder
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: branches/1.4/build_tools/builder
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: branches/1.4/build_tools/test_kernel_git
URL: http://svn.digium.com/view/zaptel/branches/1.4/build_tools/test_kernel_git?view=diff&rev=4375&r1=4374&r2=4375
==============================================================================
--- branches/1.4/build_tools/test_kernel_git (original)
+++ branches/1.4/build_tools/test_kernel_git Sat Jun 28 16:19:34 2008
@@ -12,6 +12,8 @@
 	echo "  $me checkout <kerneldir>  Pull a kernel version into <kerneldir>"
 	echo "  $me update                Update (pull) the kernel tree."
 	echo "  $me setver <kernel_ver>   Set the kernel version"
+	echo "  $me versions              Print available versions"
+	echo "  $me version               Print current (kernel) version"
 	echo "  $me build                 Test-build"
 	echo "  $me git <git command>     Run <git command>"
 	echo ""
@@ -62,14 +64,20 @@
 		cd "$kernel_dir"
 		git tag -l $2 | cut -c2-
 		;;
+	version)
+		cd "$kernel_dir"
+		echo "Configured: $kernel_ver"
+		echo -n "Actual: "
+		git describe | cut -c2-
+		;;
 	setver)
 		kernel_ver="$2"
 		tag="v$kernel_ver"
 		cd "$kernel_dir"
 		git-reset --hard "$tag"
-		make clean
-		make defconfig prepare
-		make SUBDIRS=scripts # generate scripts/mod/modpost
+		make distclean
+		make defconfig modules_prepare
+		#make SUBDIRS=scripts # generate scripts/mod/modpost
 		set_var kernel_ver "$kernel_ver"
 		;;
 	test|build)
@@ -78,7 +86,6 @@
 		# 1. Set th value of MAKE_PARAMS in git_test.conf .
 		# 2. Any extra command-line parameter.
 		shift
-		make KSRC="$kernel_dir" KVERS=$kernel_ver $MAKE_PARAMS clean
 		make KSRC="$kernel_dir" KVERS=$kernel_ver $MAKE_PARAMS "$@"
 		;;
 	*)




More information about the svn-commits mailing list