ltp-cvs — LTP CVS Commits

[Ltp-cvs] ltp/testscripts/build README, 1.1, 1.2 build_test_function.sh, 1.4, 1.5

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/testscripts/build
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3923

Modified Files:
	README build_test_function.sh 
Log Message:
- Add su / sudo support so test_ltp will try to elevate privileges before running the test, and thus the errors will be a bit more meaningful (reduced the error amount on my machine by ~250 count down to 30 errors).
- Rename CLEAN to CLEAN_TEMPFILES to avoid possible conflicts with a potentially user environment specified CLEAN variable.
- Add optional -p0 patch support.
- Add more comments to functions.
- Update README to reflect changes.
- Convert tst_resm calls to echo calls because the existing tree that these scripts are being called from a) may not be built yet, or b) be incomplete (these scripts can be invoked in a modular / standalone manner, so the full tree isn't required for running to run the scenarios...).

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: README
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README	14 Jan 2010 12:08:52 -0000	1.1
--- README	31 Jan 2010 01:49:48 -0000	1.2
***************
*** 1,2 ****
--- 1,52 ----
  This scripts contains any and all scripts which will help in testing the make
  infrastructure.
+ 
+ A brief description is as follows:
+ 
+ Foundation Build Regression Test Scripts:
+ 
+ - build_test_functions.sh	    -	Generic library functions for all
+ 					pull / build / test scenarios.
+ 
+ There are a total of 3 different positive pull / build / test scenarios that
+ have been identified which should be tested on a regular basis, both prior to
+ and after commit:
+ 
+ - test_install_in_build_tree.sh     -	Build in srcdir, install in srcdir.
+ - test_install_out_of_build_tree.sh -	Build in srcdir, install in
+ 					rootfs / outside of builddir // srcdir.
+ - test_out_of_build_tree.sh         -	Build outside of srcdir, install in
+ 					rootfs / outside of builddir // srcdir.
+ 
+ The scenarios are defined in include/mk/env_pre.mk (look for BUILD_TREE_STATE).
+ 
+ These scenarios all fulfill the following requirements:
+ 1. Pull LTP from a predefined SCM (cvs is the only method supported today, but
+    other SCMs could be added when and if support is properly enabled by the
+    project admins).
+ 2. Apply a custom -p0'able patch if defined with LTP_PATCH (THIS MUST BE THE
+    ABSOLUTE PATH TO THE PATCH!!!).
+ 3. Configure (make autotools -> configure).
+ 4. Compile (make all).
+ 5. Install (make install).
+ 6. Test (execltp -v).
+ 
+ If you want to add another scenario, please email the list requesting the
+ enhancement and we'll see what we can do to accomodate it if the scenario
+ functionally makes sense.
+ 
+ You can use a variety of variables to control how things operate, such as:
+ 
+ - CLEAN_TEMPFILES	- !1 - don't clean up the temporary generated files
+ 			  after the scenario is complete.
+ 			- 1 - clean up the temporary generated files after the
+ 			  scenario is complete.
+ - MAKEFLAGS		- flags which will be passed directly into make
+ 			  (please ensure that any and all options passed are
+ 			  properly escaped beforehand if quoted).
+ - TMPDIR		- base temporary directory for all generated and
+ 			  pulled files.
+ 
+ Utilities:
+ - ltp-missing-install-files.py - A script which does a real basic first cut at
+ 				 trying to find missing commands or test files.

Index: build_test_function.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/build_test_function.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build_test_function.sh	30 Jan 2010 21:05:32 -0000	1.4
--- build_test_function.sh	31 Jan 2010 01:49:48 -0000	1.5
***************
*** 18,25 ****
--- 18,28 ----
  #
  # Garrett Cooper, January 2010
+ #
  
  set -x
  
  # Temporary directory setup.
+ #
+ # $TMPDIR - base temporary directory; see mktemp(1) for more details.
  setup_env() {
  	testscript_dir=$(readlink -f "${0%/*}")
***************
*** 28,47 ****
  		vars="$vars $tmp_builddir"
  	else
! 		tst_brkm tst_exit TBROK 'Failed to create tmp_builddir';
  	fi
  	if tmp_destdir=$(mktemp -d) ; then
  		vars="$vars $tmp_destdir"
  	else
! 		tst_brkm tst_exit TBROK 'Failed to create tmp_destdir';
  	fi
  	if tmp_prefix=$(mktemp -d) ; then
  		vars="$vars $tmp_prefix"
  	else
! 		tst_brkm tst_exit TBROK 'Failed to create tmp_prefix';
  	fi
  	if tmp_srcdir=$(mktemp -d) ; then
  		vars="$vars $tmp_srcdir"
  	else
! 		tst_brkm tst_exit TBROK 'Failed to create tmp_srcdir';
  	fi
  	trap cleanup EXIT
--- 31,50 ----
  		vars="$vars $tmp_builddir"
  	else
! 		echo "${0##*/}: failed to create tmp_builddir";
  	fi
  	if tmp_destdir=$(mktemp -d) ; then
  		vars="$vars $tmp_destdir"
  	else
! 		echo "${0##*/}: failed to create tmp_destdir";
  	fi
  	if tmp_prefix=$(mktemp -d) ; then
  		vars="$vars $tmp_prefix"
  	else
! 		echo "${0##*/}: failed to create tmp_prefix";
  	fi
  	if tmp_srcdir=$(mktemp -d) ; then
  		vars="$vars $tmp_srcdir"
  	else
! 		echo "${0##*/}: failed to create tmp_srcdir";
  	fi
  	trap cleanup EXIT
***************
*** 59,64 ****
  }
  
  cleanup() {
! 	if [ "x${CLEAN:-1}" = x1 ] ; then
  		cd /
  		trap '' EXIT
--- 62,71 ----
  }
  
+ # Clean up the generated directories.
+ #
+ # $CLEAN_TEMPFILES - !1 -> don't clean.
+ #                  - 1 -> clean.
  cleanup() {
! 	if [ "x${CLEAN_TEMPFILES:-1}" = x1 ] ; then
  		cd /
  		trap '' EXIT
***************
*** 85,88 ****
--- 92,96 ----
  #}
  
+ #
  # Pull a fresh copy of the repository for building.
  #
***************
*** 91,96 ****
--- 99,110 ----
  # 2 - source directory.
  #
+ # $LTP_PATCH - -p0 based patch to apply after the pull is complete for
+ # precommit testing. THE PATH TO THE PATCH MUST BE ABSOLUTE!
+ #
  pull_scm() {
  	cd "$2" && eval "${1}_pull"
+ 	if [ "x$LTP_PATCH" != x ] ; then
+ 		patch -p0 < "$LTP_PATCH"
+ 	fi
  }
  
***************
*** 110,117 ****
  
  	if [ "x$2" != x ] ; then
! 		(test -d "$2" || mkdir -p "$2") || return $?
  	fi
  
! 	make -C "$1" autotools || return $?
  
  	cd "$2" && "$1/configure" ${3:+--prefix=$("$abspath" $3)}
--- 124,133 ----
  
  	if [ "x$2" != x ] ; then
! 		test -d "$2" || mkdir -p "$2"
  	fi
  
! 	make -C "$1" \
! 		${MAKEFLAGS} \
! 		autotools
  
  	cd "$2" && "$1/configure" ${3:+--prefix=$("$abspath" $3)}
***************
*** 123,130 ****
--- 139,150 ----
  # 1 - source directory
  # 2 - build directory
+ #
+ # $MAKEFLAGS - flags to pass directly to gmake(1).
+ #
  build() {
  	make ${2:+-C "$2"} \
  	     ${1:+-f "$1/Makefile" "top_srcdir=$1"} \
  	     ${2:+"top_builddir=$2"} \
+ 	     ${MAKEFLAGS} \
  	     all
  }
***************
*** 135,138 ****
--- 155,161 ----
  # 2 - build directory
  # 3 - DESTDIR
+ #
+ # $MAKEFLAGS - flags to pass directly to gmake(1).
+ #
  install_ltp() {
  	make ${2:+-C "$2"} \
***************
*** 140,143 ****
--- 163,167 ----
  	     ${2:+"top_builddir=$2"} \
  	     ${3:+"DESTDIR=$3"} \
+ 	     ${MAKEFLAGS} \
  	     install
  }
***************
*** 148,151 ****
--- 172,177 ----
  test_ltp() {
  
+ 	test_ltp="${1:-.}/test_ltp.sh"
+ 
  	# XXX (garrcoop): I haven't tracked down the root cause for the
  	# issue, but some versions of sed combined with some terminal
***************
*** 153,157 ****
  	# platforms when executing runltp. Thus, we should effectively close
  	# /dev/stdin before executing runltp via execltp.
! 	CMD="${1:-.}/bin/execltp"
  
  	if [ "x${1}" != x ] ; then
--- 179,183 ----
  	# platforms when executing runltp. Thus, we should effectively close
  	# /dev/stdin before executing runltp via execltp.
! 	echo "${1:-.}/bin/execltp < /dev/null" > "$test_ltp"
  
  	if [ "x${1}" != x ] ; then
***************
*** 159,171 ****
  	fi
  
! 	if type su > /dev/null && groups | grep wheel ; then
! 		CMD="su -c \"${CMD}\""
! 	elif type sudo > /dev/null && sudo sh -c 'exit 0' ; then
! 		CMD="sudo -- \"$CMD\""
! 	fi
  
! 	echo "Will execute using: $CMD"
  
! 	$CMD
  
  }
--- 185,213 ----
  	fi
  
! 	if [ "x$(id -ru)" != "x0" ] ; then
  
! 		if type su > /dev/null && groups | grep wheel ; then
! 			PRE_CMD="su -c"
! 		elif type sudo > /dev/null && sudo sh -c 'exit 0' ; then
! 			PRE_CMD="sudo --"
! 		fi
  
! 		if [ "x$PRE_CMD" != x ] ; then
! 			echo "chown -Rf $(id -ru) *" >> "$test_ltp"
! 			CMD="${PRE_CMD} '$test_ltp'"
! 		fi
! 
! 	fi
! 
! 	echo "${0##*/}: will execute test_ltp $CMD"
! 	chmod +x "$test_ltp"
! 	# XXX (garrcoop): uncommenting the following would work around a
! 	# craptacular `bug' with libpam where it outputs the Password: prompt
! 	# to /dev/stdout instead of /dev/tty, but it also dumps all output from
! 	# runltp, etc to the console instead of a log -- therefore if you do
! 	# cat all output to a log, just tail -f it and enter in your password
! 	# when necessary.
! 	#${CMD} > /dev/tty 2>&1
! 	${CMD}
  
  }

[Ltp-cvs] ltp/testscripts/build build_test_function.sh,1.3,1.4

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/testscripts/build
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7845/testscripts/build

Modified Files:
	build_test_function.sh 
Log Message:
Add superuser exec support so ~280 some tests in the standard set won't fail when you try and execute them.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: build_test_function.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/build_test_function.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build_test_function.sh	30 Jan 2010 05:53:56 -0000	1.3
--- build_test_function.sh	30 Jan 2010 21:05:32 -0000	1.4
***************
*** 148,153 ****
  test_ltp() {
  
- 	[ "x${1}" != x ] && export LTPROOT="$1"
- 
  	# XXX (garrcoop): I haven't tracked down the root cause for the
  	# issue, but some versions of sed combined with some terminal
--- 148,151 ----
***************
*** 155,159 ****
  	# platforms when executing runltp. Thus, we should effectively close
  	# /dev/stdin before executing runltp via execltp.
! 	"${1:-.}/bin/execltp" -v < /dev/null
  
  }
--- 153,171 ----
  	# platforms when executing runltp. Thus, we should effectively close
  	# /dev/stdin before executing runltp via execltp.
! 	CMD="${1:-.}/bin/execltp"
! 
! 	if [ "x${1}" != x ] ; then
! 		export LTPROOT="$1"
! 	fi
! 
! 	if type su > /dev/null && groups | grep wheel ; then
! 		CMD="su -c \"${CMD}\""
! 	elif type sudo > /dev/null && sudo sh -c 'exit 0' ; then
! 		CMD="sudo -- \"$CMD\""
! 	fi
! 
! 	echo "Will execute using: $CMD"
! 
! 	$CMD
  
  }

[Ltp-cvs] ltp/testscripts/build build_test_function.sh, 1.2, 1.3 test_install_in_build_tree.sh, 1.3, 1.4 test_install_out_of_build_tree.sh, 1.3, 1.4 test_out_of_build_tree.sh, 1.3, 1.4

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/testscripts/build
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv5169/testscripts/build

Modified Files:
	build_test_function.sh test_install_in_build_tree.sh 
	test_install_out_of_build_tree.sh test_out_of_build_tree.sh 
Log Message:
1. Make summary message more meaningful.
2. Make NO_CLEAN -> CLEAN (double negative is more confusing).

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: test_install_in_build_tree.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/test_install_in_build_tree.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_install_in_build_tree.sh	29 Jan 2010 09:41:22 -0000	1.3
--- test_install_in_build_tree.sh	30 Jan 2010 05:53:56 -0000	1.4
***************
*** 27,31 ****
  
  # 0. Setup the environment.
! setup_env
  # 1. Pull the SCM.
  pull_scm cvs "$tmp_srcdir"
--- 27,31 ----
  
  # 0. Setup the environment.
! setup_env "Install in build tree"
  # 1. Pull the SCM.
  pull_scm cvs "$tmp_srcdir"

Index: test_out_of_build_tree.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/test_out_of_build_tree.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_out_of_build_tree.sh	29 Jan 2010 09:41:22 -0000	1.3
--- test_out_of_build_tree.sh	30 Jan 2010 05:53:56 -0000	1.4
***************
*** 27,31 ****
  
  # 0. Setup the environment.
! setup_env
  # 1. Pull the SCM.
  pull_scm cvs "$tmp_srcdir"
--- 27,31 ----
  
  # 0. Setup the environment.
! setup_env "Build out of build tree"
  # 1. Pull the SCM.
  pull_scm cvs "$tmp_srcdir"

Index: build_test_function.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/build_test_function.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build_test_function.sh	29 Jan 2010 09:41:22 -0000	1.2
--- build_test_function.sh	30 Jan 2010 05:53:56 -0000	1.3
***************
*** 47,58 ****
  	trap cleanup EXIT
  	cat <<EOF
! ================================
! SUMMARY OF VARIABLES:
! ================================
  builddir 	-> $tmp_builddir
  destdir		-> $tmp_destdir
  prefix		-> $tmp_prefix
  srcdir		-> $tmp_srcdir
! ================================
  EOF
  
--- 47,58 ----
  	trap cleanup EXIT
  	cat <<EOF
! ========================================
! SUMMARY FOR: $1 Scenario
! ========================================
  builddir 	-> $tmp_builddir
  destdir		-> $tmp_destdir
  prefix		-> $tmp_prefix
  srcdir		-> $tmp_srcdir
! ========================================
  EOF
  
***************
*** 60,64 ****
  
  cleanup() {
! 	if [ "x${NO_CLEAN:-0}" != 1 ] ; then
  		cd /
  		trap '' EXIT
--- 60,64 ----
  
  cleanup() {
! 	if [ "x${CLEAN:-1}" = x1 ] ; then
  		cd /
  		trap '' EXIT

Index: test_install_out_of_build_tree.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/test_install_out_of_build_tree.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_install_out_of_build_tree.sh	29 Jan 2010 09:41:22 -0000	1.3
--- test_install_out_of_build_tree.sh	30 Jan 2010 05:53:56 -0000	1.4
***************
*** 27,31 ****
  
  # 0. Setup the environment.
! setup_env
  # 1. Pull the SCM.
  pull_scm cvs "$tmp_srcdir"
--- 27,31 ----
  
  # 0. Setup the environment.
! setup_env "Install out of srcdir"
  # 1. Pull the SCM.
  pull_scm cvs "$tmp_srcdir"

[Ltp-cvs] utils/analysis/lcov/rpm lcov.spec,1.12,1.13

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/rpm
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15237/rpm

Modified Files:
	lcov.spec 
Log Message:
lcov: update CVS version to 1.9


Index: lcov.spec
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/rpm/lcov.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lcov.spec	29 Jan 2010 10:09:53 -0000	1.12
--- lcov.spec	29 Jan 2010 11:07:25 -0000	1.13
***************
*** 1,6 ****
  Summary: A graphical GCOV front-end
  Name: lcov
! Version: 1.8
! Release: 1
  License: GPL
  Group: Development/Tools
--- 1,6 ----
  Summary: A graphical GCOV front-end
  Name: lcov
! Version: 1.9
! Release: pre1
  License: GPL
  Group: Development/Tools

[Ltp-cvs] utils/analysis/lcov Makefile,1.16,1.17

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15237

Modified Files:
	Makefile 
Log Message:
lcov: update CVS version to 1.9


Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	29 Jan 2010 10:09:53 -0000	1.16
--- Makefile	29 Jan 2010 11:07:25 -0000	1.17
***************
*** 12,17 ****
  #
  
! VERSION := 1.8
! RELEASE := 1
  
  CFG_DIR := $(PREFIX)/etc
--- 12,17 ----
  #
  
! VERSION := 1.9
! RELEASE := pre1
  
  CFG_DIR := $(PREFIX)/etc

[Ltp-cvs] utils/analysis/lcov/bin gendesc, 1.11, 1.12 genhtml, 1.46, 1.47 geninfo, 1.70, 1.71 genpng, 1.12, 1.13 lcov, 1.61, 1.62

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv15237/bin

Modified Files:
	gendesc genhtml geninfo genpng lcov 
Log Message:
lcov: update CVS version to 1.9


Index: genpng
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genpng,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** genpng	29 Jan 2010 10:09:53 -0000	1.12
--- genpng	29 Jan 2010 11:07:25 -0000	1.13
***************
*** 36,40 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 36,40 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** genhtml	29 Jan 2010 10:09:53 -0000	1.46
--- genhtml	29 Jan 2010 11:07:25 -0000	1.47
***************
*** 73,77 ****
  # Global constants
  our $title		= "LCOV - code coverage report";
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 73,77 ----
  # Global constants
  our $title		= "LCOV - code coverage report";
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** lcov	29 Jan 2010 10:09:53 -0000	1.61
--- lcov	29 Jan 2010 11:07:25 -0000	1.62
***************
*** 72,76 ****
  
  # Global constants
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 72,76 ----
  
  # Global constants
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: gendesc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/gendesc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gendesc	29 Jan 2010 10:09:53 -0000	1.11
--- gendesc	29 Jan 2010 11:07:25 -0000	1.12
***************
*** 42,46 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 42,46 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** geninfo	29 Jan 2010 10:09:53 -0000	1.70
--- geninfo	29 Jan 2010 11:07:25 -0000	1.71
***************
*** 59,63 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $gcov_tool		= "gcov";
--- 59,63 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.9 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $gcov_tool		= "gcov";

[Ltp-cvs] utils/analysis/lcov/bin gendesc, 1.10, 1.11 genhtml, 1.45, 1.46 geninfo, 1.69, 1.70 genpng, 1.11, 1.12 lcov, 1.60, 1.61

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8306/bin

Modified Files:
	gendesc genhtml geninfo genpng lcov 
Log Message:
lcov: finalizing release 1.8


Index: genpng
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genpng,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** genpng	18 Nov 2009 09:39:21 -0000	1.11
--- genpng	29 Jan 2010 10:09:53 -0000	1.12
***************
*** 36,40 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 36,40 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** genhtml	29 Jan 2010 09:21:22 -0000	1.45
--- genhtml	29 Jan 2010 10:09:53 -0000	1.46
***************
*** 73,77 ****
  # Global constants
  our $title		= "LCOV - code coverage report";
! our $lcov_version	= 'LCOV version 1.8 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 73,77 ----
  # Global constants
  our $title		= "LCOV - code coverage report";
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** lcov	29 Jan 2010 09:12:55 -0000	1.60
--- lcov	29 Jan 2010 10:09:53 -0000	1.61
***************
*** 72,76 ****
  
  # Global constants
! our $lcov_version	= 'LCOV version 1.8 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 72,76 ----
  
  # Global constants
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: gendesc
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/gendesc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gendesc	27 Jan 2010 16:37:50 -0000	1.10
--- gendesc	29 Jan 2010 10:09:53 -0000	1.11
***************
*** 42,46 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);
--- 42,46 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $tool_name		= basename($0);

Index: geninfo
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/geninfo,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** geninfo	22 Jan 2010 16:16:47 -0000	1.69
--- geninfo	29 Jan 2010 10:09:53 -0000	1.70
***************
*** 59,63 ****
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8 pre (CVS $Revision$)';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $gcov_tool		= "gcov";
--- 59,63 ----
  
  # Constants
! our $lcov_version	= 'LCOV version 1.8';
  our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
  our $gcov_tool		= "gcov";

[Ltp-cvs] utils/analysis/lcov Makefile,1.15,1.16 README,1.9,1.10

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8306

Modified Files:
	Makefile README 
Log Message:
lcov: finalizing release 1.8


Index: README
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/README,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** README	30 Oct 2009 14:18:45 -0000	1.9
--- README	29 Jan 2010 10:09:53 -0000	1.10
***************
*** 1,5 ****
  -------------------------------------------------
  - README file for the LTP GCOV extension (LCOV) -
! - Last changes: 2008-11-17                      -
  -------------------------------------------------
  
--- 1,5 ----
  -------------------------------------------------
  - README file for the LTP GCOV extension (LCOV) -
! - Last changes: 2010-01-29                      -
  -------------------------------------------------
  

Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile	9 Feb 2009 12:41:44 -0000	1.15
--- Makefile	29 Jan 2010 10:09:53 -0000	1.16
***************
*** 13,17 ****
  
  VERSION := 1.8
! RELEASE := pre1
  
  CFG_DIR := $(PREFIX)/etc
--- 13,17 ----
  
  VERSION := 1.8
! RELEASE := 1
  
  CFG_DIR := $(PREFIX)/etc

[Ltp-cvs] utils/analysis/lcov/rpm lcov.spec,1.11,1.12

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/rpm
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8306/rpm

Modified Files:
	lcov.spec 
Log Message:
lcov: finalizing release 1.8


Index: lcov.spec
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/rpm/lcov.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** lcov.spec	17 Nov 2008 14:11:20 -0000	1.11
--- lcov.spec	29 Jan 2010 10:09:53 -0000	1.12
***************
*** 2,6 ****
  Name: lcov
  Version: 1.8
! Release: pre1
  License: GPL
  Group: Development/Tools
--- 2,6 ----
  Name: lcov
  Version: 1.8
! Release: 1
  License: GPL
  Group: Development/Tools

[Ltp-cvs] utils/analysis/lcov/man gendesc.1, 1.5, 1.6 genhtml.1, 1.17, 1.18 geninfo.1, 1.15, 1.16 genpng.1, 1.4, 1.5 lcov.1, 1.19, 1.20 lcovrc.5, 1.11, 1.12

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/man
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8306/man

Modified Files:
	gendesc.1 genhtml.1 geninfo.1 genpng.1 lcov.1 lcovrc.5 
Log Message:
lcov: finalizing release 1.8


Index: genhtml.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/genhtml.1,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** genhtml.1	22 Jan 2010 16:13:34 -0000	1.17
--- genhtml.1	29 Jan 2010 10:09:53 -0000	1.18
***************
*** 1,3 ****
! .TH genhtml 1 "LCOV 1.8" 2008\-11\-17 "User Manuals"
  .SH NAME
  genhtml \- Generate HTML view from LCOV coverage data files
--- 1,3 ----
! .TH genhtml 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  genhtml \- Generate HTML view from LCOV coverage data files

Index: lcov.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcov.1,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** lcov.1	22 Jan 2010 16:13:58 -0000	1.19
--- lcov.1	29 Jan 2010 10:09:53 -0000	1.20
***************
*** 1,3 ****
! .TH lcov 1 "LCOV 1.8" 2008\-11\-17 "User Manuals"
  .SH NAME
  lcov \- a graphical GCOV front\-end
--- 1,3 ----
! .TH lcov 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  lcov \- a graphical GCOV front\-end

Index: lcovrc.5
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/lcovrc.5,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** lcovrc.5	22 Jan 2010 16:17:37 -0000	1.11
--- lcovrc.5	29 Jan 2010 10:09:53 -0000	1.12
***************
*** 1,3 ****
! .TH lcovrc 5 "LCOV 1.8" 2008\-11\-17 "User Manuals"
  
  .SH NAME
--- 1,3 ----
! .TH lcovrc 5 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  
  .SH NAME

Index: gendesc.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/gendesc.1,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gendesc.1	17 Nov 2008 14:11:20 -0000	1.5
--- gendesc.1	29 Jan 2010 10:09:53 -0000	1.6
***************
*** 1,3 ****
! .TH gendesc 1 "LCOV 1.8" 2008\-11\-17 "User Manuals"
  .SH NAME
  gendesc \- Generate a test case description file
--- 1,3 ----
! .TH gendesc 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  gendesc \- Generate a test case description file

Index: geninfo.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/geninfo.1,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** geninfo.1	22 Jan 2010 16:13:07 -0000	1.15
--- geninfo.1	29 Jan 2010 10:09:53 -0000	1.16
***************
*** 1,3 ****
! .TH geninfo 1 "LCOV 1.8" 2008\-11\-17 "User Manuals"
  .SH NAME
  geninfo \- Generate tracefiles from .da files
--- 1,3 ----
! .TH geninfo 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  geninfo \- Generate tracefiles from .da files

Index: genpng.1
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/man/genpng.1,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** genpng.1	17 Nov 2008 14:11:20 -0000	1.4
--- genpng.1	29 Jan 2010 10:09:53 -0000	1.5
***************
*** 1,3 ****
! .TH genpng 1 "LCOV 1.8" 2008\-11\-17 "User Manuals"
  .SH NAME
  genpng \- Generate an overview image from a source file
--- 1,3 ----
! .TH genpng 1 "LCOV 1.8" 2010\-01\-29 "User Manuals"
  .SH NAME
  genpng \- Generate an overview image from a source file

[Ltp-cvs] utils/analysis/lcov CHANGES,1.22,1.23

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv7414

Modified Files:
	CHANGES 
Log Message:
lcov: updated CHANGES file


Index: CHANGES
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/CHANGES,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CHANGES	17 Nov 2008 13:44:38 -0000	1.22
--- CHANGES	29 Jan 2010 10:01:35 -0000	1.23
***************
*** 1,2 ****
--- 1,74 ----
+ Version 1.8
+ ===========
+ 
+ gendesc:
+ - Fixed problem with single word descriptions
+ 
+ genhtml:
+ - Added support for branch coverage measurements
+ - Added --demangle-cpp option to convert C++ function names to human readable
+   format. Based on a patch by sla...@gm....
+ - Improved color legend: legend display takes up less space in HTML output
+ - Improved coverage rate limits: all coverage types use the same limits
+   unless specified otherwise
+ - Fixed CRLF line breaks in source code when generating html output. Based
+   on patch by mic...@se....
+ - Fixed warning when $HOME is not set
+ - Fixed problem with --baseline-file option. Reported by si...@gm....
+   (Undefined subroutine &main::add_fnccounts called at genhtml line 4560.)
+ - Fixed problem with --baseline-file option and files without function
+   coverage data (Can't use an undefined value as a HASH reference at genhtml
+   line 4441.)
+ - Fixed short-name option ambiguities
+ - Fixed --highlight option not showing line data from converted test data
+ - Fixed warnings about undefined value used. Reported by ni...@zh....
+ - Fixed error when processing tracefiles without function data. Reported
+   by ric...@gm... (Can't use an undefined value as a HASH
+   reference at genhtml line 1506.)
+ 
+ geninfo:
+ - Added support for branch coverage measurements
+ - Added support for exclusion markers: Users can exclude lines of code from
+   coverage reports by adding keywords to the source code.
+ - Added --derive-func-data option
+ - Added --debug option to better debug problems with graph files
+ - Fixed CRLF line breaks in source code when generating tracefiles. Based on
+   patch by mic...@se....
+ - Fixed problems with unnamed source files
+ - Fixed warning when $HOME is not set. Reported by aca...@fr....
+ - Fixed errors when processing unnamed source files
+ - Fixed help text typo
+ - Fixed errors when processing incomplete function names in .bb files
+ - Fixed filename prefix detection
+ - Fixed problem with matching filename
+ - Fixed problem when LANG is set to non-english locale. Reported by
+   ben...@ya....
+ - Fixed short-name option ambiguities
+ 
+ genpng:
+ - Fixed runtime-warning
+ 
+ lcov:
+ - Added support for branch coverage measurements
+ - Added support for the linux-2.6.31 upstream gcov kernel support
+ - Added --from-package and --to-package options
+ - Added --derive-func-data option
+ - Added overall coverage result output for more operations
+ - Improved output of lcov --list
+ - Improved gcov-kernel handling
+ - Fixed minor problem with --diff
+ - Fixed double-counting of function data
+ - Fixed warning when $HOME is not set. Reported by aca...@fr....
+ - Fixed error when combining tracefiles without function data. Reported by
+   ric...@gm.... (Can't use an undefined value as a HASH reference
+   at lcov line 1341.)
+ - Fixed help text typo
+ - Fixed filename prefix detection
+ - Fixed lcov ignoring information about converted test data
+ 
+ README: 
+ - Added note to mention required -lgcov switch during linking
+ 
+  
  Version 1.7:
  ============
***************
*** 86,90 ****
  - Updated man page
  - Fixed lcov not working when -k is specified more than once
! - Fixed lcov not deleting .gcda files when specifiying -z and -d
  
  lcovrc:
--- 158,162 ----
  - Updated man page
  - Fixed lcov not working when -k is specified more than once
! - Fixed lcov not deleting .gcda files when specifying -z and -d
  
  lcovrc:

[Ltp-cvs] ltp/testscripts/build build_test_function.sh, 1.1, 1.2 test_install_in_build_tree.sh, 1.2, 1.3 test_install_out_of_build_tree.sh, 1.2, 1.3 test_out_of_build_tree.sh, 1.2, 1.3

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/testscripts/build
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4214/testscripts/build

Modified Files:
	build_test_function.sh test_install_in_build_tree.sh 
	test_install_out_of_build_tree.sh test_out_of_build_tree.sh 
Log Message:
1. env_pre.mk: Add additional build-tree states and unify them under the $(BUILD_TREE_STATE) variable.
2. Makefile: Resolve issue spotted by Mitani-san because it was an overlooked corner case that wasn't properly expressed until $(BUILD_TREE_STATE) was introduced.
3. testscripts/... : resolve some issues with the test scripts.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: test_install_in_build_tree.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/test_install_in_build_tree.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_install_in_build_tree.sh	28 Jan 2010 15:16:47 -0000	1.2
--- test_install_in_build_tree.sh	29 Jan 2010 09:41:22 -0000	1.3
***************
*** 37,39 ****
  install_ltp "$srcdir" "$srcdir" ""
  # 5. Test.
! test_ltp "$install_dir"
--- 37,39 ----
  install_ltp "$srcdir" "$srcdir" ""
  # 5. Test.
! test_ltp ""

Index: test_out_of_build_tree.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/test_out_of_build_tree.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_out_of_build_tree.sh	28 Jan 2010 15:16:47 -0000	1.2
--- test_out_of_build_tree.sh	29 Jan 2010 09:41:22 -0000	1.3
***************
*** 31,39 ****
  pull_scm cvs "$tmp_srcdir"
  # 2. Configure.
! configure "$srcdir" "$tmp_builddir" "$prefix" "$destdir"
  # 3. -->> Compile out-of-build-tree. <<--
  build "$srcdir" "$tmp_builddir"
  # 4. Install.
! install_ltp "$srcdir" "$tmp_builddir" "$destdir"
  # 5. Test.
! test_ltp "$install_dir"
--- 31,39 ----
  pull_scm cvs "$tmp_srcdir"
  # 2. Configure.
! configure "$srcdir" "$tmp_builddir" "$tmp_prefix" "$tmp_destdir"
  # 3. -->> Compile out-of-build-tree. <<--
  build "$srcdir" "$tmp_builddir"
  # 4. Install.
! install_ltp "$srcdir" "$tmp_builddir" "$tmp_destdir"
  # 5. Test.
! test_ltp "$("$abspath" "$tmp_destdir/${tmp_prefix:-/opt/ltp}")"

Index: build_test_function.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/build_test_function.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_test_function.sh	28 Jan 2010 15:14:13 -0000	1.1
--- build_test_function.sh	29 Jan 2010 09:41:22 -0000	1.2
***************
*** 31,38 ****
  	fi
  	if tmp_destdir=$(mktemp -d) ; then
! 		vars="$vars $destdir"
  	else
  		tst_brkm tst_exit TBROK 'Failed to create tmp_destdir';
  	fi
  	if tmp_srcdir=$(mktemp -d) ; then
  		vars="$vars $tmp_srcdir"
--- 31,43 ----
  	fi
  	if tmp_destdir=$(mktemp -d) ; then
! 		vars="$vars $tmp_destdir"
  	else
  		tst_brkm tst_exit TBROK 'Failed to create tmp_destdir';
  	fi
+ 	if tmp_prefix=$(mktemp -d) ; then
+ 		vars="$vars $tmp_prefix"
+ 	else
+ 		tst_brkm tst_exit TBROK 'Failed to create tmp_prefix';
+ 	fi
  	if tmp_srcdir=$(mktemp -d) ; then
  		vars="$vars $tmp_srcdir"
***************
*** 41,50 ****
  	fi
  	trap cleanup EXIT
  }
  
  cleanup() {
! 	cd /
! 	trap '' EXIT
! 	rm -Rf $vars
  }
  
--- 46,68 ----
  	fi
  	trap cleanup EXIT
+ 	cat <<EOF
+ ================================
+ SUMMARY OF VARIABLES:
+ ================================
+ builddir 	-> $tmp_builddir
+ destdir		-> $tmp_destdir
+ prefix		-> $tmp_prefix
+ srcdir		-> $tmp_srcdir
+ ================================
+ EOF
+ 
  }
  
  cleanup() {
! 	if [ "x${NO_CLEAN:-0}" != 1 ] ; then
! 		cd /
! 		trap '' EXIT
! 		rm -Rf $vars
! 	fi
  }
  
***************
*** 54,58 ****
  	export CVSROOT=:pserver:ano...@lt...:/cvsroot/ltp
  
! 	if ([ -f ~/.cvspass ] || touch ~/.cvspass) ; then
  		cvs -d$CVSROOT login && cvs -z3 export -f -r HEAD ltp && srcdir="$PWD/ltp"
  	fi
--- 72,76 ----
  	export CVSROOT=:pserver:ano...@lt...:/cvsroot/ltp
  
! 	if ( [ -f ~/.cvspass ] || touch ~/.cvspass ) ; then
  		cvs -d$CVSROOT login && cvs -z3 export -f -r HEAD ltp && srcdir="$PWD/ltp"
  	fi
***************
*** 88,100 ****
  # global and thus I won't need to include the same checks down below...
  configure() {
  	abspath=$(readlink -f "$testscript_dir/../../scripts/abspath.sh")
  	if [ "x$2" != x ] ; then
  		(test -d "$2" || mkdir -p "$2") || return $?
  	fi
  	make -C "$1" autotools || return $?
! 	ARGS=
! 	[ "x$3" != x ] && ARGS="--prefix=$("$abspath" $3)"
! 	cd "$2" && "$1/configure" $ARGS
! 	install_dir=$("$abspath" "$4/$3")
  }
  
--- 106,120 ----
  # global and thus I won't need to include the same checks down below...
  configure() {
+ 
  	abspath=$(readlink -f "$testscript_dir/../../scripts/abspath.sh")
+ 
  	if [ "x$2" != x ] ; then
  		(test -d "$2" || mkdir -p "$2") || return $?
  	fi
+ 
  	make -C "$1" autotools || return $?
! 
! 	cd "$2" && "$1/configure" ${3:+--prefix=$("$abspath" $3)}
! 
  }
  
***************
*** 104,108 ****
  # 2 - build directory
  build() {
! 	make ${2:--C "$2"} ${1:-top_srcdir=$1} all
  }
  
--- 124,131 ----
  # 2 - build directory
  build() {
! 	make ${2:+-C "$2"} \
! 	     ${1:+-f "$1/Makefile" "top_srcdir=$1"} \
! 	     ${2:+"top_builddir=$2"} \
! 	     all
  }
  
***************
*** 111,122 ****
  # 1 - source directory
  # 2 - build directory
  install_ltp() {
! 	make ${2:--C "$2"} ${1:-top_srcdir=$1} install
  }
  
  # Run a test on the installed tree.
  #
! # 1 install directory - installed tree, e.g. $(DESTDIR)/$(prefix)
  test_ltp() {
  	# XXX (garrcoop): I haven't tracked down the root cause for the
  	# issue, but some versions of sed combined with some terminal
--- 134,153 ----
  # 1 - source directory
  # 2 - build directory
+ # 3 - DESTDIR
  install_ltp() {
! 	make ${2:+-C "$2"} \
! 	     ${1:+-f "$1/Makefile" "top_srcdir=$1"} \
! 	     ${2:+"top_builddir=$2"} \
! 	     ${3:+"DESTDIR=$3"} \
! 	     install
  }
  
  # Run a test on the installed tree.
  #
! # 1 - install directory for tree, e.g. $(DESTDIR)/$(prefix)
  test_ltp() {
+ 
+ 	[ "x${1}" != x ] && export LTPROOT="$1"
+ 
  	# XXX (garrcoop): I haven't tracked down the root cause for the
  	# issue, but some versions of sed combined with some terminal
***************
*** 124,127 ****
  	# platforms when executing runltp. Thus, we should effectively close
  	# /dev/stdin before executing runltp via execltp.
! 	cd "$1" && "$1/bin/execltp" < /dev/null
  }
--- 155,159 ----
  	# platforms when executing runltp. Thus, we should effectively close
  	# /dev/stdin before executing runltp via execltp.
! 	"${1:-.}/bin/execltp" -v < /dev/null
! 
  }

Index: test_install_out_of_build_tree.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testscripts/build/test_install_out_of_build_tree.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_install_out_of_build_tree.sh	28 Jan 2010 15:16:47 -0000	1.2
--- test_install_out_of_build_tree.sh	29 Jan 2010 09:41:22 -0000	1.3
***************
*** 1,5 ****
  #!/bin/sh
  #
! #    install outside build-tree script.
  #
  #    Copyright (C) 2010, Cisco Systems Inc.
--- 1,5 ----
  #!/bin/sh
  #
! #    build / install outside build-tree script.
  #
  #    Copyright (C) 2010, Cisco Systems Inc.
***************
*** 31,39 ****
  pull_scm cvs "$tmp_srcdir"
  # 2. Configure.
! configure "$srcdir" "$srcdir" "$prefix" "$destdir"
  # 3. -->> Compile out-of-build-tree. <<--
  build "$srcdir" "$srcdir"
  # 4. Install.
! install_ltp "$srcdir" "$srcdir" "$destdir"
  # 5. Test.
! test_ltp "$install_dir"
--- 31,39 ----
  pull_scm cvs "$tmp_srcdir"
  # 2. Configure.
! configure "$srcdir" "$srcdir" "$tmp_prefix" "$tmp_destdir"
  # 3. -->> Compile out-of-build-tree. <<--
  build "$srcdir" "$srcdir"
  # 4. Install.
! install_ltp "$srcdir" "$srcdir" "$tmp_destdir"
  # 5. Test.
! test_ltp "$("$abspath" "$tmp_destdir/${tmp_prefix:-/opt/ltp}")"

[Ltp-cvs] ltp/include/mk env_pre.mk,1.13,1.14

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/include/mk
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4214/include/mk

Modified Files:
	env_pre.mk 
Log Message:
1. env_pre.mk: Add additional build-tree states and unify them under the $(BUILD_TREE_STATE) variable.
2. Makefile: Resolve issue spotted by Mitani-san because it was an overlooked corner case that wasn't properly expressed until $(BUILD_TREE_STATE) was introduced.
3. testscripts/... : resolve some issues with the test scripts.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: env_pre.mk
===================================================================
RCS file: /cvsroot/ltp/ltp/include/mk/env_pre.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** env_pre.mk	28 Jan 2010 16:03:04 -0000	1.13
--- env_pre.mk	29 Jan 2010 09:41:22 -0000	1.14
***************
*** 28,31 ****
--- 28,40 ----
  ENV_PRE_LOADED = 1
  
+ # "out-of-build-tree" build.
+ BUILD_TREE_BUILDDIR_INSTALL	:= 1
+ # "in-srcdir" build / install.
+ BUILD_TREE_SRCDIR_INSTALL	:= 2
+ # "in-srcdir" build, non-srcdir install.
+ BUILD_TREE_NONSRCDIR_INSTALL	:= 3
+ # configure not run.
+ BUILD_TREE_UNCONFIGURED		:= 4
+ 
  ifndef MAKE_VERSION_CHECK
  export MAKE_VERSION_CHECK = 1
***************
*** 86,111 ****
  endif
  
! # We can piece together where we're located in the source and object trees with
! # just these two vars and $(CURDIR).
! export abs_top_srcdir abs_top_builddir
  
! # DO NOT MOVE THIS BELOW include [..]/config.mk (will break out-of-build tree
! # checks)!
  ifneq ($(abs_builddir),$(abs_srcdir))
! OUT_OF_BUILD_TREE		:= 1
  else
! # Stub support for installing directly in the build tree; the support is not
! # there yet, but the variable itself has its own uses...
  ifeq ($(strip $(DESTDIR)$(prefix)),)
! INSTALL_IN_BUILD_TREE		:= 1
! else
! ifeq ($(subst $(abs_top_srcdir),,$(prefix)),)
! INSTALL_IN_BUILD_TREE		:= 1
  endif
  endif
  endif
  
! ifeq ($(filter autotools %clean help,$(MAKECMDGOALS)),)
! include $(abs_top_builddir)/include/mk/config.mk
  endif
  
--- 95,126 ----
  endif
  
! # autotools, *clean, and help don't require config.mk...
! ifeq ($(filter autotools %clean help,$(MAKECMDGOALS)),)
  
! include $(abs_top_builddir)/include/mk/config.mk
! 
! # START out-of-build-tree check.
  ifneq ($(abs_builddir),$(abs_srcdir))
! BUILD_TREE_STATE		:= $(BUILD_TREE_BUILDDIR_INSTALL)
  else
! # Else, not out of build tree..
! 
! # START srcdir build-tree install checks
  ifeq ($(strip $(DESTDIR)$(prefix)),)
! BUILD_TREE_STATE		:= $(BUILD_TREE_SRCDIR_INSTALL)
! else  # Empty $(DESTDIR)$(prefix)
! ifeq ($(abs_top_srcdir),$(prefix))
! BUILD_TREE_STATE		:= $(BUILD_TREE_SRCDIR_INSTALL)
  endif
+ # END srcdir build-tree install checks
  endif
+ # END out-of-build-tree check.
  endif
  
! # Is the build-tree configured yet?
! ifeq ($(BUILD_TREE_STATE),)
! ifneq ($(wildcard $(abs_top_builddir)/include/mk/config.mk),)
! BUILD_TREE_STATE		:= $(BUILD_TREE_NONSRCDIR_INSTALL)
! endif
  endif
  
***************
*** 113,115 ****
--- 128,138 ----
  .DEFAULT_GOAL			:= all
  
+ endif	# END autotools, *clean...
+ 
+ BUILD_TREE_STATE		?= $(BUILD_TREE_UNCONFIGURED)
+ 
+ # We can piece together where we're located in the source and object trees with
+ # just these two vars and $(CURDIR).
+ export abs_top_srcdir abs_top_builddir BUILD_TREE_STATE
+ 
  endif

[Ltp-cvs] ltp Makefile,1.61,1.62

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4214

Modified Files:
	Makefile 
Log Message:
1. env_pre.mk: Add additional build-tree states and unify them under the $(BUILD_TREE_STATE) variable.
2. Makefile: Resolve issue spotted by Mitani-san because it was an overlooked corner case that wasn't properly expressed until $(BUILD_TREE_STATE) was introduced.
3. testscripts/... : resolve some issues with the test scripts.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/Makefile,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Makefile	28 Jan 2010 16:16:33 -0000	1.61
--- Makefile	29 Jan 2010 09:41:22 -0000	1.62
***************
*** 71,75 ****
  COMMON_TARGETS		+= testcases tools
  # Don't want to nuke the original files if we're installing in-build-tree.
! ifneq ($(INSTALL_IN_BUILD_TREE),1)
  INSTALL_TARGETS		+= runtest testscripts
  CLEAN_TARGETS		+= include runtest testscripts
--- 71,75 ----
  COMMON_TARGETS		+= testcases tools
  # Don't want to nuke the original files if we're installing in-build-tree.
! ifneq ($(BUILD_TREE_STATE),$(BUILD_TREE_SRCDIR_INSTALL))
  INSTALL_TARGETS		+= runtest testscripts
  CLEAN_TARGETS		+= include runtest testscripts
***************
*** 140,144 ****
  	$(RM) -Rf "$(INSTALL_DIR)"
  
! ifneq ($(INSTALL_IN_BUILD_TREE),1)
  CLEAN_TARGETS	+= clean_install_dir
  endif
--- 140,146 ----
  	$(RM) -Rf "$(INSTALL_DIR)"
  
! # Don't clean the directory if the build-tree is set to the srcdir, or the
! # build tree is unconfigured.
! ifneq ($(filter $(BUILD_TREE_STATE),$(BUILD_TREE_SRCDIR_INSTALL) $(BUILD_TREE_UNCONFIGURED)),)
  CLEAN_TARGETS	+= clean_install_dir
  endif
***************
*** 167,171 ****
  	install -m 00755 "$(top_srcdir)/$(@F)" "$@"
  
! ifneq ($(INSTALL_IN_BUILD_TREE),1)
  INSTALL_TARGETS		+= $(addprefix $(INSTALL_DIR)/,$(SRCDIR_INSTALL_TARGETS))
  endif
--- 169,173 ----
  	install -m 00755 "$(top_srcdir)/$(@F)" "$@"
  
! ifneq ($(BUILD_TREE_STATE),$(BUILD_TREE_SRCDIR_INSTALL))
  INSTALL_TARGETS		+= $(addprefix $(INSTALL_DIR)/,$(SRCDIR_INSTALL_TARGETS))
  endif

[Ltp-cvs] utils/analysis/lcov/bin genhtml,1.44,1.45

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv580

Modified Files:
	genhtml 
Log Message:
genhtml: use sans-serif font for function table


Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** genhtml	29 Jan 2010 08:44:47 -0000	1.44
--- genhtml	29 Jan 2010 09:21:22 -0000	1.45
***************
*** 2943,2946 ****
--- 2943,2947 ----
  	  background-color: #FF0000;
  	  font-weight: bold;
+ 	  font-family: sans-serif;
  	}
  
***************
*** 2953,2956 ****
--- 2954,2958 ----
  	  background-color: #DAE7FE;
  	  font-weight: bold;
+ 	  font-family: sans-serif;
  	}
  

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.59,1.60

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31619

Modified Files:
	lcov 
Log Message:
lcov: improve list output


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** lcov	29 Jan 2010 08:56:19 -0000	1.59
--- lcov	29 Jan 2010 09:12:55 -0000	1.60
***************
*** 2747,2750 ****
--- 2747,2767 ----
  }
  
+ 
+ #
+ # shorten_filename(filename, width)
+ #
+ # Truncate filename if it is longer than width characters.
+ #
+ 
+ sub shorten_filename($$)
+ {
+ 	my ($filename, $width) = @_;
+ 
+ 	return $filename if (length($filename) <= $width);
+ 	return '...'.substr($filename, length($filename) - $width + 3,
+ 			    $width - 3);
+ }
+ 
+ 
  #
  # list()
***************
*** 2782,2786 ****
  	$prefix = get_common_prefix(1, keys(%{$data}));
  	$prefix = "" if ($prefix eq "/");
! 	# Get longest filename length and function coverage flag
  	foreach $filename (keys(%{$data})) {
  		# Determine maximum length of entries
--- 2799,2803 ----
  	$prefix = get_common_prefix(1, keys(%{$data}));
  	$prefix = "" if ($prefix eq "/");
! 	# Get longest filename length
  	foreach $filename (keys(%{$data})) {
  		# Determine maximum length of entries
***************
*** 2792,2795 ****
--- 2809,2813 ----
  		$strlen -= length($prefix) + 1;
  	}
+ 	$strlen = 28 if ($strlen > 28);
  	# Filename
  	$format		= " %-${strlen}s    ";
***************
*** 2869,2872 ****
--- 2887,2891 ----
  		# Shorten filename by common prefix
  		$filename =~ s/^\Q$prefix\/\E// if (length($prefix) > 0);
+ 		$filename = shorten_filename($filename, $strlen);
  
  		# Determine line coverage rate for this file

[Ltp-cvs] utils/analysis/lcov/bin lcov,1.58,1.59

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29368

Modified Files:
	lcov 
Log Message:
lcov: fix overall rate display for tracefiles with more than one testcase


Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** lcov	29 Jan 2010 08:44:47 -0000	1.58
--- lcov	29 Jan 2010 08:56:19 -0000	1.59
***************
*** 2464,2469 ****
  		$entry = $data{$source_file};
  		($testdata, $sumcount, $funcdata, $checkdata, $testfncdata,
! 		 $sumfnccount, $testbrdata, $sumbrcount) =
  			get_info_entry($entry);
  		foreach $testname (sort(keys(%{$testdata})))
  		{
--- 2464,2479 ----
  		$entry = $data{$source_file};
  		($testdata, $sumcount, $funcdata, $checkdata, $testfncdata,
! 		 $sumfnccount, $testbrdata, $sumbrcount, $found, $hit,
! 		 $f_found, $f_hit, $br_found, $br_hit) =
  			get_info_entry($entry);
+ 
+ 		# Add to totals
+ 		$ln_total_found += $found;
+ 		$ln_total_hit += $hit;
+ 		$fn_total_found += $f_found;
+ 		$fn_total_hit += $f_hit;
+ 		$br_total_found += $br_found;
+ 		$br_total_hit += $br_hit;
+ 
  		foreach $testname (sort(keys(%{$testdata})))
  		{
***************
*** 2495,2502 ****
  			print(INFO_HANDLE "FNH:$f_hit\n");
  
- 			# Add to total
- 			$fn_total_found += $f_found;
- 			$fn_total_hit += $f_hit;
- 
  			# Write branch related data
  			$br_found = 0;
--- 2505,2508 ----
***************
*** 2524,2531 ****
  			}
  
- 			# Add to total
- 			$br_total_found += $br_found;
- 			$br_total_hit += $br_hit;
- 
  			# Write line related data
  			foreach $line (sort({$a <=> $b} keys(%{$testcount})))
--- 2530,2533 ----
***************
*** 2546,2553 ****
  			print(INFO_HANDLE "LH:$hit\n");
  			print(INFO_HANDLE "end_of_record\n");
- 
- 			# Add to total
- 			$ln_total_found += $found;
- 			$ln_total_hit += $hit;
  		}
  	}
--- 2548,2551 ----

[Ltp-cvs] utils/analysis/lcov/bin genhtml, 1.43, 1.44 lcov, 1.57, 1.58

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27660

Modified Files:
	genhtml lcov 
Log Message:
lcov/genhtml: fix warning while merging branch data


Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** genhtml	28 Jan 2010 15:59:23 -0000	1.43
--- genhtml	29 Jan 2010 08:44:47 -0000	1.44
***************
*** 4829,4833 ****
  
  		# Add taken counts
- 		$v_taken = br_num_to_taken($v_taken);
  		$taken = br_taken_add($taken, $v_taken);
  		last;
--- 4829,4832 ----

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** lcov	28 Jan 2010 15:59:23 -0000	1.57
--- lcov	29 Jan 2010 08:44:47 -0000	1.58
***************
*** 1375,1379 ****
  
  		# Add taken counts
- 		$v_taken = br_num_to_taken($v_taken);
  		$taken = br_taken_add($taken, $v_taken);
  		last;
--- 1375,1378 ----

[Ltp-cvs] ltp runltp,1.53,1.54

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3646

Modified Files:
	runltp 
Log Message:
This diff wasn't ready for prime time yet...

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: runltp
===================================================================
RCS file: /cvsroot/ltp/ltp/runltp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** runltp	28 Jan 2010 15:46:58 -0000	1.53
--- runltp	28 Jan 2010 16:24:16 -0000	1.54
***************
*** 55,59 ****
  #
  #               Oct 27 2007 - Modified - Ricardo Salveti de Araujo and Subrata Modak
! #               - better ways to integrate "ltp/bin/genload/stress" with "ltp/runltp"
  #               Nov 24 2007 - Modified - Subrata Modak
  #               - Added a new option to generate output in HTML format also. Also retaining
--- 55,59 ----
  #
  #               Oct 27 2007 - Modified - Ricardo Salveti de Araujo and Subrata Modak
! #               - better ways to integrate "ltp/tools/genload/stress" with "ltp/runltp"
  #               Nov 24 2007 - Modified - Subrata Modak
[...1493 lines suppressed...]
  }
  
  cleanup()
  {
!     rm -rf "${TMP}"
  }
  
--- 942,953 ----
         ###############################################################"
         
! 	EOF
!     }
!     exit $VALUE
  }
  
  cleanup()
  {
!     rm -rf ${TMP}
  }
  

[Ltp-cvs] ltp Makefile,1.60,1.61

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2512

Modified Files:
	Makefile 
Log Message:
Don't install basic scripts if we're doing install-in-tree.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/Makefile,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** Makefile	28 Jan 2010 16:00:55 -0000	1.60
--- Makefile	28 Jan 2010 16:16:33 -0000	1.61
***************
*** 167,174 ****
  	install -m 00755 "$(top_srcdir)/$(@F)" "$@"
  
! INSTALL_TARGETS		+= $(addprefix $(INSTALL_DIR)/,\
! 				$(SRCDIR_INSTALL_TARGETS))\
! 			   $(addprefix $(DESTDIR)/$(bindir)/,\
! 				$(BINDIR_INSTALL_SCRIPTS))
  
  $(INSTALL_TARGETS): $(INSTALL_DIR) $(DESTDIR)/$(bindir)
--- 167,174 ----
  	install -m 00755 "$(top_srcdir)/$(@F)" "$@"
  
! ifneq ($(INSTALL_IN_BUILD_TREE),1)
! INSTALL_TARGETS		+= $(addprefix $(INSTALL_DIR)/,$(SRCDIR_INSTALL_TARGETS))
! endif
! INSTALL_TARGETS		+= $(addprefix $(DESTDIR)/$(bindir)/,$(BINDIR_INSTALL_SCRIPTS))
  
  $(INSTALL_TARGETS): $(INSTALL_DIR) $(DESTDIR)/$(bindir)

[Ltp-cvs] ltp/include/mk env_pre.mk,1.12,1.13

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/include/mk
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv915/include/mk

Modified Files:
	env_pre.mk 
Log Message:
Fix a missing endif after a hasty checkin.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: env_pre.mk
===================================================================
RCS file: /cvsroot/ltp/ltp/include/mk/env_pre.mk,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** env_pre.mk	28 Jan 2010 16:00:55 -0000	1.12
--- env_pre.mk	28 Jan 2010 16:03:04 -0000	1.13
***************
*** 104,107 ****
--- 104,108 ----
  endif
  endif
+ endif
  
  ifeq ($(filter autotools %clean help,$(MAKECMDGOALS)),)

[Ltp-cvs] ltp/include/mk env_pre.mk,1.11,1.12

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/include/mk
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv470/include/mk

Modified Files:
	env_pre.mk 
Log Message:
Make some minor corrections for install-in-build-tree.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: env_pre.mk
===================================================================
RCS file: /cvsroot/ltp/ltp/include/mk/env_pre.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** env_pre.mk	19 Jan 2010 08:11:32 -0000	1.11
--- env_pre.mk	28 Jan 2010 16:00:55 -0000	1.12
***************
*** 99,102 ****
--- 99,105 ----
  ifeq ($(strip $(DESTDIR)$(prefix)),)
  INSTALL_IN_BUILD_TREE		:= 1
+ else
+ ifeq ($(subst $(abs_top_srcdir),,$(prefix)),)
+ INSTALL_IN_BUILD_TREE		:= 1
  endif
  endif
***************
*** 106,109 ****
--- 109,113 ----
  endif
  
+ # make 3.80 called it .DEFAULT_TARGET.
  .DEFAULT_GOAL			:= all
  

[Ltp-cvs] ltp Makefile,1.59,1.60

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv470

Modified Files:
	Makefile 
Log Message:
Make some minor corrections for install-in-build-tree.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/Makefile,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** Makefile	18 Jan 2010 05:24:29 -0000	1.59
--- Makefile	28 Jan 2010 16:00:55 -0000	1.60
***************
*** 70,75 ****
  
  COMMON_TARGETS		+= testcases tools
! INSTALL_TARGETS		+= $(COMMON_TARGETS) runtest testscripts
! CLEAN_TARGETS		+= $(COMMON_TARGETS) lib include runtest testscripts
  BOOTSTRAP_TARGETS	:= $(sort $(COMMON_TARGETS) $(CLEAN_TARGETS) $(INSTALL_TARGETS))
  
--- 70,80 ----
  
  COMMON_TARGETS		+= testcases tools
! # Don't want to nuke the original files if we're installing in-build-tree.
! ifneq ($(INSTALL_IN_BUILD_TREE),1)
! INSTALL_TARGETS		+= runtest testscripts
! CLEAN_TARGETS		+= include runtest testscripts
! endif
! INSTALL_TARGETS		+= $(COMMON_TARGETS)
! CLEAN_TARGETS		+= $(COMMON_TARGETS) lib
  BOOTSTRAP_TARGETS	:= $(sort $(COMMON_TARGETS) $(CLEAN_TARGETS) $(INSTALL_TARGETS))
  

[Ltp-cvs] utils/analysis/lcov/bin genhtml, 1.42, 1.43 lcov, 1.56, 1.57

[Peter O. <obe...@us...>]

Update of /cvsroot/ltp/utils/analysis/lcov/bin
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv32611

Modified Files:
	genhtml lcov 
Log Message:
lcov: fix branch coverage related issues

- warnings when combining certain combinations of branch data
- branches are not merged correctly when multiple input files are specified
  to genhtml or when lcov -a is used


Index: genhtml
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/genhtml,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** genhtml	27 Jan 2010 12:00:05 -0000	1.42
--- genhtml	28 Jan 2010 15:59:23 -0000	1.43
***************
*** 152,155 ****
--- 152,158 ----
  our $BR_CLOSE	= 5;
  
+ # Branch data combination types
+ our $BR_SUB = 0;
+ our $BR_ADD = 1;
  
  # Data related prototypes
***************
*** 187,193 ****
--- 190,199 ----
  sub write_dir_page($$$$$$$$$$$$$$$$$);
  sub classify_rate($$$$);
+ sub br_taken_add($$);
+ sub br_taken_sub($$);
  sub br_ivec_len($);
  sub br_ivec_get($$);
  sub br_ivec_push($$$$);
+ sub combine_brcount($$$);
  sub get_br_found_and_hit($);
  sub warn_handler($);
***************
*** 1864,1875 ****
  
  #
! # add_brcount(brcount1, brcount2)
  #
! # Add branch coverage data. Return list (brcount_added, br_found, br_hit)
  #
  
! sub add_brcount($$)
  {
! 	my ($brcount1, $brcount2) = @_;
  	my $line;
  	my $block;
--- 1870,1883 ----
  
  #
! # combine_brcount(brcount1, brcount2, type)
  #
! # If add is BR_ADD, add branch coverage data and return list (brcount_added,
! # br_found, br_hit). If add is BR_SUB, subtract the taken values of brcount2
! # from brcount1 and return (brcount_sub, br_found, br_hit).
  #
  
! sub combine_brcount($$$)
  {
! 	my ($brcount1, $brcount2, $type) = @_;
  	my $line;
  	my $block;
***************
*** 1881,1891 ****
  	my $result;
  
! 	# Add branches from first count to database
  	$db = brcount_to_db($brcount1);
! 	# Add branches from second count to database
  	foreach $line (keys(%{$brcount2})) {
  		my $brdata = $brcount2->{$line};
- 		my $i;
  		my $num = br_ivec_len($brdata);
  
  		for ($i = 0; $i < $num; $i++) {
--- 1889,1899 ----
  	my $result;
  
! 	# Convert branches from first count to database
  	$db = brcount_to_db($brcount1);
! 	# Combine values from database and second count
  	foreach $line (keys(%{$brcount2})) {
  		my $brdata = $brcount2->{$line};
  		my $num = br_ivec_len($brdata);
+ 		my $i;
  
  		for ($i = 0; $i < $num; $i++) {
***************
*** 1893,1905 ****
  			my $new_taken = $db->{$line}->{$block}->{$branch};
  
! 			$new_taken = '-' if (!defined($new_taken));
! 			if ($taken ne '-') {
! 				if ($new_taken eq '-') {
! 					$new_taken = $taken;
! 				} else {
! 					$new_taken += $taken;
! 				}
  			}
! 			$db->{$line}->{$block}->{$branch} = $new_taken;
  		}
  	}
--- 1901,1911 ----
  			my $new_taken = $db->{$line}->{$block}->{$branch};
  
! 			if ($type == $BR_ADD) {
! 				$new_taken = br_taken_add($new_taken, $taken);
! 			} elsif ($type == $BR_SUB) {
! 				$new_taken = br_taken_sub($new_taken, $taken);
  			}
! 			$db->{$line}->{$block}->{$branch} = $new_taken
! 				if (defined($new_taken));
  		}
  	}
***************
*** 1930,1935 ****
  			# Branch coverage data for this testname exists
  			# in both data sets: add
! 			($brcount) = add_brcount($testbrdata1->{$testname},
! 						 $testbrdata2->{$testname});
  			$result{$testname} = $brcount;
  			next;
--- 1936,1941 ----
  			# Branch coverage data for this testname exists
  			# in both data sets: add
! 			($brcount) = combine_brcount($testbrdata1->{$testname},
! 					 $testbrdata2->{$testname}, $BR_ADD);
  			$result{$testname} = $brcount;
  			next;
***************
*** 2017,2021 ****
  	$result_testbrdata = add_testbrdata($testbrdata1, $testbrdata2);
  	($result_sumbrcount, $br_found, $br_hit) =
! 		add_brcount($sumbrcount1, $sumbrcount2);
  
  	# Combine testdata
--- 2023,2027 ----
  	$result_testbrdata = add_testbrdata($testbrdata1, $testbrdata2);
  	($result_sumbrcount, $br_found, $br_hit) =
! 		combine_brcount($sumbrcount1, $sumbrcount2, $BR_ADD);
  
  	# Combine testdata
***************
*** 4692,4695 ****
--- 4698,4769 ----
  
  #
+ # br_taken_to_num(taken)
+ #
+ # Convert a branch taken value .info format to number format.
+ #
+ 
+ sub br_taken_to_num($)
+ {
+ 	my ($taken) = @_;
+ 
+ 	return 0 if ($taken eq '-');
+ 	return $taken + 1;
+ }
+ 
+ 
+ #
+ # br_num_to_taken(taken)
+ #
+ # Convert a branch taken value in number format to .info format.
+ #
+ 
+ sub br_num_to_taken($)
+ {
+ 	my ($taken) = @_;
+ 
+ 	return '-' if ($taken == 0);
+ 	return $taken - 1;
+ }
+ 
+ 
+ #
+ # br_taken_add(taken1, taken2)
+ #
+ # Return the result of taken1 + taken2 for 'branch taken' values.
+ #
+ 
+ sub br_taken_add($$)
+ {
+ 	my ($t1, $t2) = @_;
+ 
+ 	return $t1 if (!defined($t2));
+ 	return $t2 if (!defined($t1));
+ 	return $t1 if ($t2 eq '-');
+ 	return $t2 if ($t1 eq '-');
+ 	return $t1 + $t2;
+ }
+ 
+ 
+ #
+ # br_taken_sub(taken1, taken2)
+ #
+ # Return the result of taken1 - taken2 for 'branch taken' values. Return 0
+ # if the result would become negative.
+ #
+ 
+ sub br_taken_sub($$)
+ {
+ 	my ($t1, $t2) = @_;
+ 
+ 	return $t1 if (!defined($t2));
+ 	return undef if (!defined($t1));
+ 	return $t1 if ($t1 eq '-');
+ 	return $t1 if ($t2 eq '-');
+ 	return 0 if $t2 > $t1;
+ 	return $t1 - $t2;
+ }
+ 
+ 
+ #
  # br_ivec_len(vector)
  #
***************
*** 4726,4734 ****
  
  	# Decode taken value from an integer
! 	if ($taken == 0) {
! 		$taken = "-";
! 	} else {
! 		$taken--;
! 	}
  
  	return ($block, $branch, $taken);
--- 4800,4804 ----
  
  	# Decode taken value from an integer
! 	$taken = br_num_to_taken($taken);
  
  	return ($block, $branch, $taken);
***************
*** 4739,4743 ****
  # br_ivec_push(vector, block, branch, taken)
  #
! # Add an entry to the branch coverage vector.
  #
  
--- 4809,4814 ----
  # br_ivec_push(vector, block, branch, taken)
  #
! # Add an entry to the branch coverage vector. If an entry with the same
! # branch ID already exists, add the corresponding taken values.
  #
  
***************
*** 4746,4760 ****
  	my ($vec, $block, $branch, $taken) = @_;
  	my $offset;
  
  	$vec = "" if (!defined($vec));
- 	$offset = br_ivec_len($vec) * $BR_VEC_ENTRIES;
  
! 	# Encode taken value into an integer
! 	if ($taken eq "-") {
! 		$taken = 0;
! 	} else {
! 		$taken++;
  	}
  
  	# Add to vector
  	vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH) = $block;
--- 4817,4840 ----
  	my ($vec, $block, $branch, $taken) = @_;
  	my $offset;
+ 	my $num = br_ivec_len($vec);
+ 	my $i;
  
  	$vec = "" if (!defined($vec));
  
! 	# Check if branch already exists in vector
! 	for ($i = 0; $i < $num; $i++) {
! 		my ($v_block, $v_branch, $v_taken) = br_ivec_get($vec, $i);
! 
! 		next if ($v_block != $block || $v_branch != $branch);
! 
! 		# Add taken counts
! 		$v_taken = br_num_to_taken($v_taken);
! 		$taken = br_taken_add($taken, $v_taken);
! 		last;
  	}
  
+ 	$offset = $i * $BR_VEC_ENTRIES;
+ 	$taken = br_taken_to_num($taken);
+ 
  	# Add to vector
  	vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH) = $block;
***************
*** 5165,5214 ****
  
  #
- # subtract_brcounts(data, base)
- #
- # Subtract branch call counts found in base from those in data.
- # Return (data, br_found, br_hit).
- #
- 
- sub subtract_brcounts($$)
- {
- 	my ($brcount, $brcount_base) = @_;
- 	my $line;
- 	my $block;
- 	my $branch;
- 	my $taken;
- 	my $db;
- 	my $br_found = 0;
- 	my $br_hit = 0;
- 	my $result;
- 
- 	# Add branches to database
- 	$db = brcount_to_db($brcount);
- 	# Subtract counts
- 	foreach $line (keys(%{$brcount_base})) {
- 		my $brdata = $brcount_base->{$line};
- 		my $i;
- 		my $num = br_ivec_len($brdata);
- 
- 		for ($i = 0; $i < $num; $i++) {
- 			my $db_taken;
- 			($block, $branch, $taken) = br_ivec_get($brdata, $i);
- 
- 			$db_taken = $db->{$line}->{$block}->{$branch};
- 			next if (!defined($db_taken));
- 			next if ($db_taken eq '-');
- 			$db_taken -= $taken;
- 			$db_taken = 0 if ($db_taken < 0);
- 			$db->{$line}->{$block}->{$branch} = $db_taken;
- 		}
- 	}
- 	# Convert database back to brcount format
- 	($result, $br_found, $br_hit) = db_to_brcount($db);
- 
- 	return ($result, $br_found, $br_hit);
- }
- 
- 
- #
  # apply_baseline(data_ref, baseline_ref)
  #
--- 5245,5248 ----
***************
*** 5289,5294 ****
  						   $base_sumfnccount);
  			($data_testbrcount) =
! 				subtract_brcounts($data_testbrcount,
! 						   $base_sumbrcount);
  
  
--- 5323,5328 ----
  						   $base_sumfnccount);
  			($data_testbrcount) =
! 				combine_brcount($data_testbrcount,
! 						 $base_sumbrcount, $BR_SUB);
  
  
***************
*** 5318,5322 ****
  				add_fnccount($sumfnccount, $data_testfnccount);
  			($sumbrcount, $br_found, $br_hit) =
! 				add_brcount($sumbrcount, $data_testbrcount);
  		}
  
--- 5352,5357 ----
  				add_fnccount($sumfnccount, $data_testfnccount);
  			($sumbrcount, $br_found, $br_hit) =
! 				combine_brcount($sumbrcount, $data_testbrcount,
! 						$BR_ADD);
  		}
  

Index: lcov
===================================================================
RCS file: /cvsroot/ltp/utils/analysis/lcov/bin/lcov,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** lcov	27 Jan 2010 12:10:04 -0000	1.56
--- lcov	28 Jan 2010 15:59:23 -0000	1.57
***************
*** 95,98 ****
--- 95,102 ----
  our $BR_VEC_WIDTH	= 32;
  
+ # Branch data combination types
+ our $BR_SUB = 0;
+ our $BR_ADD = 1;
+ 
  # Prototypes
  sub print_usage(*);
***************
*** 135,138 ****
--- 139,143 ----
  sub create_package($$$;$);
  sub get_func_found_and_hit($);
+ sub br_ivec_get($$);
  
  # Global variables & initialization
***************
*** 1264,1267 ****
--- 1269,1341 ----
  
  #
+ # br_taken_to_num(taken)
+ #
+ # Convert a branch taken value .info format to number format.
+ #
+ 
+ sub br_taken_to_num($)
+ {
+ 	my ($taken) = @_;
+ 
+ 	return 0 if ($taken eq '-');
+ 	return $taken + 1;
+ }
+ 
+ 
+ #
+ # br_num_to_taken(taken)
+ #
+ # Convert a branch taken value in number format to .info format.
+ #
+ 
+ sub br_num_to_taken($)
+ {
+ 	my ($taken) = @_;
+ 
+ 	return '-' if ($taken == 0);
+ 	return $taken - 1;
+ }
+ 
+ 
+ #
+ # br_taken_add(taken1, taken2)
+ #
+ # Return the result of taken1 + taken2 for 'branch taken' values.
+ #
+ 
+ sub br_taken_add($$)
+ {
+ 	my ($t1, $t2) = @_;
+ 
+ 	return $t1 if (!defined($t2));
+ 	return $t2 if (!defined($t1));
+ 	return $t1 if ($t2 eq '-');
+ 	return $t2 if ($t1 eq '-');
+ 	return $t1 + $t2;
+ }
+ 
+ 
+ #
+ # br_taken_sub(taken1, taken2)
+ #
+ # Return the result of taken1 - taken2 for 'branch taken' values. Return 0
+ # if the result would become negative.
+ #
+ 
+ sub br_taken_sub($$)
+ {
+ 	my ($t1, $t2) = @_;
+ 
+ 	return $t1 if (!defined($t2));
+ 	return undef if (!defined($t1));
+ 	return $t1 if ($t1 eq '-');
+ 	return $t1 if ($t2 eq '-');
+ 	return 0 if $t2 > $t1;
+ 	return $t1 - $t2;
+ }
+ 
+ 
+ #
+ #
  # br_ivec_len(vector)
  #
***************
*** 1281,1285 ****
  # br_ivec_push(vector, block, branch, taken)
  #
! # Add an entry to the branch coverage vector.
  #
  
--- 1355,1360 ----
  # br_ivec_push(vector, block, branch, taken)
  #
! # Add an entry to the branch coverage vector. If an entry with the same
! # branch ID already exists, add the corresponding taken values.
  #
  
***************
*** 1288,1302 ****
  	my ($vec, $block, $branch, $taken) = @_;
  	my $offset;
  
  	$vec = "" if (!defined($vec));
- 	$offset = br_ivec_len($vec) * $BR_VEC_ENTRIES;
  
! 	# Encode taken value into an integer
! 	if ($taken eq "-") {
! 		$taken = 0;
! 	} else {
! 		$taken++;
  	}
  
  	# Add to vector
  	vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH) = $block;
--- 1363,1386 ----
  	my ($vec, $block, $branch, $taken) = @_;
  	my $offset;
+ 	my $num = br_ivec_len($vec);
+ 	my $i;
  
  	$vec = "" if (!defined($vec));
  
! 	# Check if branch already exists in vector
! 	for ($i = 0; $i < $num; $i++) {
! 		my ($v_block, $v_branch, $v_taken) = br_ivec_get($vec, $i);
! 
! 		next if ($v_block != $block || $v_branch != $branch);
! 
! 		# Add taken counts
! 		$v_taken = br_num_to_taken($v_taken);
! 		$taken = br_taken_add($taken, $v_taken);
! 		last;
  	}
  
+ 	$offset = $i * $BR_VEC_ENTRIES;
+ 	$taken = br_taken_to_num($taken);
+ 
  	# Add to vector
  	vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH) = $block;
***************
*** 1328,1336 ****
  
  	# Decode taken value from an integer
! 	if ($taken == 0) {
! 		$taken = "-";
! 	} else {
! 		$taken--;
! 	}
  
  	return ($block, $branch, $taken);
--- 1412,1416 ----
  
  	# Decode taken value from an integer
! 	$taken = br_num_to_taken($taken);
  
  	return ($block, $branch, $taken);
***************
*** 2057,2069 ****
  
  
  #
! # add_brcount(brcount1, brcount2)
! #
! # Add branch coverage data. Return list (brcount_added, br_found, br_hit)
  #
  
! sub add_brcount($$)
  {
! 	my ($brcount1, $brcount2) = @_;
  	my $line;
  	my $block;
--- 2137,2150 ----
  
  
+ # combine_brcount(brcount1, brcount2, type)
  #
! # If add is BR_ADD, add branch coverage data and return list (brcount_added,
! # br_found, br_hit). If add is BR_SUB, subtract the taken values of brcount2
! # from brcount1 and return (brcount_sub, br_found, br_hit).
  #
  
! sub combine_brcount($$$)
  {
! 	my ($brcount1, $brcount2, $type) = @_;
  	my $line;
  	my $block;
***************
*** 2075,2085 ****
  	my $result;
  
! 	# Add branches from first count to database
  	$db = brcount_to_db($brcount1);
! 	# Add branches from second count to database
  	foreach $line (keys(%{$brcount2})) {
  		my $brdata = $brcount2->{$line};
- 		my $i;
  		my $num = br_ivec_len($brdata);
  
  		for ($i = 0; $i < $num; $i++) {
--- 2156,2166 ----
  	my $result;
  
! 	# Convert branches from first count to database
  	$db = brcount_to_db($brcount1);
! 	# Combine values from database and second count
  	foreach $line (keys(%{$brcount2})) {
  		my $brdata = $brcount2->{$line};
  		my $num = br_ivec_len($brdata);
+ 		my $i;
  
  		for ($i = 0; $i < $num; $i++) {
***************
*** 2087,2099 ****
  			my $new_taken = $db->{$line}->{$block}->{$branch};
  
! 			$new_taken = '-' if (!defined($new_taken));
! 			if ($taken ne '-') {
! 				if ($new_taken eq '-') {
! 					$new_taken = $taken;
! 				} else {
! 					$new_taken += $taken;
! 				}
  			}
! 			$db->{$line}->{$block}->{$branch} = $new_taken;
  		}
  	}
--- 2168,2178 ----
  			my $new_taken = $db->{$line}->{$block}->{$branch};
  
! 			if ($type == $BR_ADD) {
! 				$new_taken = br_taken_add($new_taken, $taken);
! 			} elsif ($type == $BR_SUB) {
! 				$new_taken = br_taken_sub($new_taken, $taken);
  			}
! 			$db->{$line}->{$block}->{$branch} = $new_taken
! 				if (defined($new_taken));
  		}
  	}
***************
*** 2124,2130 ****
  			# Branch coverage data for this testname exists
  			# in both data sets: add
! 			($brcount) = add_brcount(
  				$testbrdata1->{$testname},
! 				$testbrdata2->{$testname});
  			$result{$testname} = $brcount;
  			next;
--- 2203,2209 ----
  			# Branch coverage data for this testname exists
  			# in both data sets: add
! 			($brcount) = combine_brcount(
  				$testbrdata1->{$testname},
! 				$testbrdata2->{$testname}, $BR_ADD);
  			$result{$testname} = $brcount;
  			next;
***************
*** 2212,2216 ****
  	$result_testbrdata = add_testbrdata($testbrdata1, $testbrdata2);
  	($result_sumbrcount, $br_found, $br_hit) =
! 		add_brcount($sumbrcount1, $sumbrcount2);
  
  	# Combine testdata
--- 2291,2295 ----
  	$result_testbrdata = add_testbrdata($testbrdata1, $testbrdata2);
  	($result_sumbrcount, $br_found, $br_hit) =
! 		combine_brcount($sumbrcount1, $sumbrcount2, $BR_ADD);
  
  	# Combine testdata
***************
*** 3548,3554 ****
  				delete($testfncdata->{$testname.",diff"});
  				# Add branch counts
! 				($testbrdata->{$testname}) = add_brcount(
  					$testbrdata->{$testname},
! 					$testbrdata->{$testname.",diff"});
  				delete($testbrdata->{$testname.",diff"});
  			}
--- 3627,3634 ----
  				delete($testfncdata->{$testname.",diff"});
  				# Add branch counts
! 				($testbrdata->{$testname}) = combine_brcount(
  					$testbrdata->{$testname},
! 					$testbrdata->{$testname.",diff"},
! 					$BR_ADD);
  				delete($testbrdata->{$testname.",diff"});
  			}

[Ltp-cvs] ltp/tools create_kernel_faults_in_loops_and_probability.pl, 1.1, 1.2

[Garrett C. <yab...@us...>]

Update of /cvsroot/ltp/ltp/tools
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv31767/tools

Modified Files:
	create_kernel_faults_in_loops_and_probability.pl 
Log Message:
Convert from tools/ to bin/.

Signed-off-by: Garrett Cooper <yan...@gm...>



Index: create_kernel_faults_in_loops_and_probability.pl
===================================================================
RCS file: /cvsroot/ltp/ltp/tools/create_kernel_faults_in_loops_and_probability.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** create_kernel_faults_in_loops_and_probability.pl	22 Aug 2009 12:49:50 -0000	1.1
--- create_kernel_faults_in_loops_and_probability.pl	28 Jan 2010 15:50:43 -0000	1.2
***************
*** 80,84 ****
  			if ($token_counter == 1 && $counter == 1) {
  				#Time to include the fault injection script in the first loop
! 				print "\$LTPROOT/tools/insert_kernel_faults.sh " . $failure_probability . "; " . $token;
  				$token_counter++;
  				next;
--- 80,84 ----
  			if ($token_counter == 1 && $counter == 1) {
  				#Time to include the fault injection script in the first loop
! 				print "\$LTPROOT/bin/insert_kernel_faults.sh " . $failure_probability . "; " . $token;
  				$token_counter++;
  				next;
***************
*** 90,94 ****
  			#Until all faults has been successfully restored to default values...
  			#Keep restoring them
! 			print "; " . "\$LTPROOT/tools/restore_kernel_faults_default.sh; RC=\$?; while [ \$RC -ne 0 ]; do \$LTPROOT/tools/restore_kernel_faults_default.sh; RC=\$?; done\n"
  		} else {
  			print "\n"
--- 90,94 ----
  			#Until all faults has been successfully restored to default values...
  			#Keep restoring them
! 			print "; " . "\$LTPROOT/bin/restore_kernel_faults_default.sh; RC=\$?; while [ \$RC -ne 0 ]; do \$LTPROOT/bin/restore_kernel_faults_default.sh; RC=\$?; done\n"
  		} else {
  			print "\n"