Changes to pounder's build scripts

deleted file mode 100755
index 966e381..0000000
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# Determine if there is at least ONE disc in the system's CDROM drives.
-
-# Copyright (C) 2003-2006 IBM
-# 
-# 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.
-
-. "$POUNDER_SRCDIR/libidecd.sh"
-
-DEFAULT_MOUNT="$POUNDER_TMPDIR/cdmount"
-
-# Ensure that our default mountpoint and destination dirs exist.
-mkdir -p "$DEFAULT_MOUNT"
-
-# How many discs can we find?
-DISCS_FOUND=`find_discs_with_media | wc -l`
-if [ $DISCS_FOUND -lt 1 ]; then
-	echo -en "Examined "
-	find_disc_devices | while read f; do
-		echo -en "$f "
-		eject "$f"
-	done
-	echo " and found no discs to test."
-	echo "Please put a disc into the CD/DVD drive(s) and press ENTER."
-	read garbage
-
-	DISCS_FOUND=`find_discs_with_media | wc -l`
-	if [ $DISCS_FOUND -lt 1 ]; then
-		echo "Still can't find any discs.  CD test will (probably) not run."
-		exit 0
-	fi
-fi
-
-exit 0

68 lines not on this page · raw message

deleted file mode 100755
index 349752e..0000000
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Build the program that wiggles X windows.
-
-# Copyright (C) 2003-2006 IBM
-# 
-# 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.
-
-
-cd "$POUNDER_SRCDIR/xbonkers/"
-
-make $*
-RESULT=$?
-
-if [ $RESULT -ne 0 ]; then
-	echo
-	echo "xbonkers build failed; you probably need X11 devel packages."
-	echo -en "Ignore for now [y/N]? "
-	while read f; do
-		if [ "$f" == "y" -o "$f" == "Y" ]; then
-			exit 0
-		elif [ "$f" == "n" -o "$f" == "n" -o -z "$f" ]; then
-			exit $RESULT
-		fi
-	done
-fi

index c3afdf2..d408fb7 100755
@@ -20,10 +20,34 @@
 # 02111-1307, USA.
 
 
-PKGNAME=bonnie++-1.03a
+PKGNAME=bonnie++-1.03e
 TARNAME="$PKGNAME.tgz"
 PROGNAME=bonnie++
 
+# How much RAM do we have?
+RAM=`cat /proc/meminfo | grep MemTotal | awk -F " " '{print $2}'`
+SPACE_REQUIRED=`expr $RAM \* 4`
+
+# Now figure out where we have mounted filesystems
+MOUNTS=`egrep "(ext|reiser)" /proc/mounts | awk -F " " '{print $2}'`
+
+RET=$(
+	echo $MOUNTS | sed -e 's/ /\n/g' | while read f; do
+
+        	# Do we have enough space? (assume 4x RAM is enough)
+        	FREE_SPACE=`df -k -P "$f" | tail -n 1 | awk -F " " '{print $4}'`
+
+        	if [ "$FREE_SPACE" -lt "$SPACE_REQUIRED" ]; then
+			break
+        	fi
+	done
+)
+
+if [ ! -z $RET ]; then
+        echo "[bonnie++] Insufficient space. Free space: $FREE_SPACE kB. Space required: $SPACE_REQUIRED kB. Not building bonnie."
+	exit 1
+fi
+
 # Is it already installed?
 PROG=`which $PROGNAME`
 if [ ! -z "$PROG" ]; then

index 87cd62e..1511578 100755
@@ -20,7 +20,7 @@
 # 02111-1307, USA.
 
 
-TARNAME=linux-2.6.18.tar.gz
+TARNAME=linux-2.6.39.tar.bz2
 # WARNING: If you update the kernel version that we use, be sure to
 # update $POUNDER_SRCDIR/memtest.patch, $POUNDER_HOME/test_scripts/memtest,
 # $POUNDER_HOME/test_scripts/build_kernel, and

deleted file mode 100755
index 9b8c79d..0000000
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# Builds a program to generate random coordinates for X11
-# programs' -geometry flag.
-
-# Copyright (C) 2003-2006 IBM
-# 
-# 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.
-
-
-cd "$POUNDER_SRCDIR/randacoords/"
-
-make $*

index 7ddebe8..96514f3 100755
@@ -20,6 +20,13 @@
 # 02111-1307, USA.
 
 
+# Do any CPU support cpufreq?
+CPUFREQ_ENABLED_CPUS=`/bin/ls -lad /sys/devices/system/cpu/cpu*/cpufreq 2> /dev/null | wc -l`
+if [ "$CPUFREQ_ENABLED_CPUS" -lt 1 ]; then
+        echo "[cpufreq] None of your CPUs support cpufreq. Not building cpufreq."
+        exit 255
+fi
+
 cd "$POUNDER_SRCDIR/cpufreq/"
 
 make $*

56 lines not on this page · raw message

index 4874a81..ed2e114 100755
@@ -26,9 +26,9 @@ Req_Maj=1
 Req_Min=8
 Req_Pat=7
 
-TESTCURRENTIPMI=0
+TESTCURRENTIPMI=1 #TODO: 0
 
-PKGNAME=ipmitool-1.8.8
+PKGNAME=ipmitool-1.8.9
 #end of stuff to move
 TARNAME="$PKGNAME.tar.gz"
 PROGNAME=ipmitool

@@ -58,6 +58,7 @@ if [ $TESTCURRENTIPMI -ne 0 ]; then
 		if [ ! -f "$TARNAME" ]; then
 			get_from_sourceforge $PROGNAME $TARNAME
 		fi
+		#TODO: what if no target found?
 	fi
 	
 	# Unpack if req'd

99 lines not on this page · raw message

index 68dcdbe..70defe4 100755
@@ -55,23 +55,24 @@ fi
 
 # NAK the setregid EPERM -> EINVAL patch, because it's
 # broken on 2.6!  May be fixed some time after 20050804 release.
-if [ ! -e "testcases/kernel/syscalls/setregid/setregid02.c.pounder" ]; then
-	echo "Patching some holes in ltp..."
-	cp -pRdu testcases/kernel/syscalls/setregid/setregid02.c testcases/kernel/syscalls/setregid/setregid02.c.pounder
-	patch -p1 < $POUNDER_SRCDIR/ltp-setregid-fix.patch
-	RESULT=$?
-	if [ $RESULT -ne 0 ]; then
-		echo Patching failed.
-		exit 1
-	fi
-fi
+#if [ ! -e "testcases/kernel/syscalls/setregid/setregid02.c.pounder" ]; then
+#	echo "Patching some holes in ltp..."
+#	cp -pRdu testcases/kernel/syscalls/setregid/setregid02.c testcases/kernel/syscalls/setregid/setregid02.c.pounder
+#	patch -p1 < $POUNDER_SRCDIR/ltp-setregid-fix.patch
+#	RESULT=$?
+#	if [ $RESULT -ne 0 ]; then
+#		echo Patching failed.
+#		exit 1
+#	fi
+#fi
 
 # Build
+./configure
 make -j$NR_CPUS
 MK_RET=$?
 
 if [ $MK_RET -eq 0 ]; then
-	make install
+	make DESTDIR=$POUNDER_TMPDIR install
 	MK_RET=$?
 fi
 

index 4308c43..e22def9 100755
@@ -20,24 +20,38 @@
 # 02111-1307, USA.
 
 
+# How much RAM do we have?
+RAM=`cat /proc/meminfo | grep MemTotal | awk -F " " '{print $2}'`
+SPACE_REQUIRED=`expr $RAM \* 2`
+
+# Do we have enough space?
+MEMTESTDIR="$POUNDER_TMPDIR/memtest/"
+rm -rf "$MEMTESTDIR"
+mkdir -p "$MEMTESTDIR"
+FREE_SPACE=`df -k -P "$MEMTESTDIR" | tail -n 1 | awk -F " " '{print $4}'`
+if [ "$FREE_SPACE" -lt "$SPACE_REQUIRED" ]; then
+        echo "[memtest] Insufficient space. Free space: $FREE_SPACE kB. Space required: $SPACE_REQUIRED kB. Not building memtest."
+        exit -1
+fi
+
 cd "$POUNDER_OPTDIR"
 
 # Download a script and parse out the junk we don't want.
 if [ ! -f "memtest.sh" ]; then
 	if [ $USE_CACHE -eq 1 ]; then
-		wget "${POUNDER_CACHE}memtest.html"
+		wget "${POUNDER_CACHE}memtest.shtml"
 	fi
-	if [ ! -f "memtest.html" ]; then
-		wget "http://people.redhat.com/dledford/memtest.html"
+	if [ ! -f "memtest.shtml" ]; then
+		wget "http://people.redhat.com/dledford/memtest.shtml"
 	fi
 	IN_BLOCK=0
-
-	if [ ! -f "memtest.html" ]; then
-		echo "Could not download memtest.html.  Aborting!"
+	
+	if [ ! -f "memtest.shtml" ]; then
+		echo "[memtest] Could not download memtest.shtml.  Aborting!"
 		exit -1
 	fi
-	
-	(cat memtest.html | while read f; do
+
+	(cat memtest.shtml | while read f; do
 		echo "$f" | grep -q BLOCKQUOTE
 		if [ "$?" -eq 0 ]; then
 			if [ "$IN_BLOCK" -eq 0 ]; then

@@ -53,5 +67,5 @@ if [ ! -f "memtest.sh" ]; then
 	done) | sed -e 's/\/bin\/bash2/\/bin\/bash/g' > memtest.sh
 	chmod a+x memtest.sh
 	patch -p0 < "$POUNDER_SRCDIR/memtest.patch"
-	rm -rf memtest.html
+	rm -rf memtest.shtml
 fi

55 lines not on this page · raw message

64 lines not on this page · raw message

new file mode 100755
index 0000000..dede6e7
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Build time tests
+
+# Copyright (C) 2003-2006 IBM
+#
+# 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.
+
+cd "$POUNDER_SRCDIR/time_tests/"
+
+make $*

new file mode 100755
index 0000000..ec856b7
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Build time tests
+
+# Copyright (C) 2003-2006 IBM
+#
+# 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.
+
+cd "$POUNDER_SRCDIR/time_tests/"
+
+make $*
+

deleted file mode 100755
index 25d93cb..0000000
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Build time tests
-
-# Copyright (C) 2003-2006 IBM
-# 
-# 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.
-
-
-cd "$POUNDER_SRCDIR/time_tests/"
-
-make $*

new file mode 100755
index 0000000..77e0917
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Build the program that wiggles X windows.
+
+# Copyright (C) 2003-2006 IBM
+#
+# 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.
+
+cd "$POUNDER_SRCDIR/xbonkers/"
+
+make $*
+RESULT=$?
+
+if [ $RESULT -ne 0 ]; then
+        echo
+        echo "[xterm_stress] build failed; you probably need X11 devel packages."
+        exit 1
+fi
+
+# Build a program to generate random coordinates for X11
+# programs' -geometry flag.
+
+cd "$POUNDER_SRCDIR/randacoords/"
+
+make $*
+