summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-01-12 18:14:26 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-01-12 18:14:26 +0000
commit725d7ee9931ee392b9118b5243f198a96e9e5d22 (patch)
tree3f68cd80aed22d97875b64dfca33818fff809e58
parent13608a91d5ab0293ed2158c1c6b7a5ec6ecc87a4 (diff)
2009-01-12 Joel Sherrill <joel.sherrill@oarcorp.com>
* README: Add information about checking out writeable copies of the tools. * VERSIONS: Switch to directory structure most commonly used. * test_driver: Add beginnings of having pieces optional so eventually command line arguments can be added.
-rw-r--r--ChangeLog8
-rw-r--r--README12
-rw-r--r--VERSIONS7
-rwxr-xr-xtest_driver30
4 files changed, 44 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f14a93..2b55f46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-12 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * README: Add information about checking out writeable copies
+ of the tools.
+ * VERSIONS: Switch to directory structure most commonly used.
+ * test_driver: Add beginnings of having pieces optional so eventually
+ command line arguments can be added.
+
2009-01-09 Joel Sherrill <joel.sherrill@oarcorp.com>
* README: Add more details now that rtbf64 is running tests.
diff --git a/README b/README
index 6e37374..04ad573 100644
--- a/README
+++ b/README
@@ -55,23 +55,27 @@ cvs -z 9 -d :pserver:anonymous@www.rtems.org:/usr1/CVS co -P rtems
# binutils
mkdir binutils-cvs
cd binutils-cvs
-cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co binutils
+READ ONLY: cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co binutils
+WRITE: CVS_RSH=ssh cvs -d :ext:joel@sourceware.org:/cvs/src co -P binutils
cd ..
# newlib
mkdir newlib-cvs
cd newlib-cvs
-cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co newlib
+READ ONLY: cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co newlib
+WRITE: CVS_RSH=ssh cvs -d :ext:joel@sourceware.org:/cvs/src co -P newlib
cd ..
# gdb
mkdir gdb-cvs
cd gdb-cvs
-cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co gdb
+READ ONLY: cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co gdb
+WRITE: CVS_RSH=ssh cvs -d :ext:joel@sourceware.org:/cvs/src co -P gdb
cd ..
# gcc
-svn checkout svn://gcc.gnu.org/svn/gcc/trunk gcc-svn
+READ ONLY: svn checkout svn://gcc.gnu.org/svn/gcc/trunk gcc-svn
+WRITE svn co svn+ssh://joel@gcc.gnu.org/svn/gcc/trunk gcc-svn
# symlink newlib into gcc-svn
cd gcc-svn
diff --git a/VERSIONS b/VERSIONS
index fc90339..597dbf9 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,5 +1,5 @@
# USE FULL PATHS!!!
-BASEDIR=/home/joel/work-gnat/svn/
+BASEDIR=${HOME}/test-gcc
RTEMS_VERSION=4.10
@@ -7,11 +7,12 @@ AUTOCONF=${BASEDIR}/autoconf-2.63
AUTOMAKE=${BASEDIR}/automake-1.10.2
GCCDIR=${BASEDIR}/gcc-svn
BINUTILSDIR=${BASEDIR}/binutils-cvs/src
-NEWLIBDIR=${BASEDIR}/newlib-cvs/
+NEWLIBDIR=${BASEDIR}/newlib-cvs/src
GDBDIR=${BASEDIR}/gdb-cvs/src
RTEMSDIR=${BASEDIR}/rtems
# These things vary between the GCC CFARM Debian and OAR Fedora test machines
+# TODO: It would be good to probe to figure this out.
case `hostname` in
gcc*)
NATIVE_GCC_EXTRA_ARGS="--with-mpfr=/opt/cfarm/mpfr-2.3.1/"
@@ -27,6 +28,8 @@ case `hostname` in
;;
esac
+# Specify the desired parallelism based upon the host name.
+# TODO: It would be good to probe to figure this out.
case `hostname` in
RTBF32|RTBF64)
MAKEJOBS="-j6"
diff --git a/test_driver b/test_driver
index f611bde..47ad4bb 100755
--- a/test_driver
+++ b/test_driver
@@ -23,6 +23,12 @@ echo Started at: ${start}
BASEDIR=`pwd`
+### TODO: Parse arguments to get these
+doCleanInstallPoint="yes"
+doUpdateTools=yes
+doUpdateRTEMS=yes
+doNative=yes
+
# HELPER - Update RTEMS
update_rtems()
{
@@ -132,21 +138,31 @@ do_cpus()
echo Stopped at: ${stopped}
}
-# Clean the install point
-clean_up
+if [ ${doCleanInstallPoint} = "yes" ] ; then
+ # Clean the install point
+ clean_up
+fi
# Update gcc and install autotools in parallel
-install_auto &
-update_gcc &
-update_others &
+ if [ ${doCleanInstallPoint} = "yes" ] ; then
+ install_auto &
+ fi
+ if [ ${doUpdateTools} = "yes" ] ; then
+ update_gcc &
+ update_others &
+ fi
wait
# Do any remaining prep work in parallel
-update_rtems &
+ if [ ${doUpdateRTEMS} = "yes" ] ; then
+ update_rtems &
+ fi
wait
# Build the native compiler as a baseline to build the others
-time sh -x ${SCRIPTDIR}/do_one -n >native.log 2>&1
+ if [ ${doNative} = "yes" ] ; then
+ time sh -x ${SCRIPTDIR}/do_one -n >native.log 2>&1
+ fi
# Now cycle over all these CPUs
if [ $? -eq 0 ] ; then