[m-rev.] diff: nightly builds on goliath and bob
Julien Fischer
juliensf at csse.unimelb.edu.au
Tue Jan 6 17:48:23 AEDT 2009
Build and test Mercury on goliath and bob (one of the VMs on spelter).
tools/run_all_tests_from_cron:
tools/test_mercury:
Add the necessary entries for goliath and bob.
Update the beta FTP directory - it's now hosted on uranus
not earth.
Delete stuff related to earth and aral, which are no longer
in use.
Delete stuff related to uranus, it shouldn't be doing
Mercury builds.
Julien.
Index: run_all_tests_from_cron
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/run_all_tests_from_cron,v
retrieving revision 1.84
diff -u -r1.84 run_all_tests_from_cron
--- run_all_tests_from_cron 30 Sep 2008 05:54:14 -0000 1.84
+++ run_all_tests_from_cron 6 Jan 2009 06:43:44 -0000
@@ -57,7 +57,7 @@
:
else
case "$HOST" in
- neptune|goofy|eris)
+ neptune|goofy|eris|bob)
CVSROOT=":ext:mercury at cvs.mercury.csse.unimelb.edu.au:$CVSROOT"
;;
*)
@@ -104,12 +104,6 @@
#esac
BRANCH=latest
;;
- aral)
- # Aral has limited disk space, and not having to expend it
- # on the release branch helps conserve it.
- #
- BRANCH=latest
- ;;
jupiter)
BRANCH=latest
#case $DAY in
@@ -117,7 +111,7 @@
# *) BRANCH=latest ;;
#esac
;;
- uranus|swordfish)
+ swordfish)
BRANCH=latest
;;
saturn|neptune|goofy|eris)
Index: test_mercury
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.344
diff -u -r1.344 test_mercury
--- test_mercury 30 Sep 2008 05:54:14 -0000 1.344
+++ test_mercury 6 Jan 2009 06:43:44 -0000
@@ -63,7 +63,7 @@
:
else
case "$HOST" in
- neptune|goofy|eris)
+ neptune|goofy|eris|bob)
CVSROOT=":ext:mercury at cvs.mercury.csse.unimelb.edu.au:$CVSROOT"
;;
*)
@@ -234,10 +234,6 @@
OPTIMIZE="-O2 --intermodule-optimization"
;;
- earth)
- OPTIMIZE="-O2"
- ;;
-
saturn)
OPTIMIZE="-O5 --intermodule-optimization"
;;
@@ -260,13 +256,17 @@
# if scripts is a symbolic link to a directory.
;;
- aral)
- OPTIMIZE="-O3"
+ taura)
+ OPTIMIZE="-O5 --intermodule-optimization"
;;
- taura)
+ goliath)
OPTIMIZE="-O5 --intermodule-optimization"
;;
+
+ bob)
+ OPTIMIZE="-O2"
+ ;;
esac
# On some systems, the file system we're using does not support links.
@@ -306,7 +306,7 @@
# So if you modify this list of hosts, you need to also modify
# run_all_tests_from_cron.
case $HOST in
- earth|aral|jupiter|swordfish|saturn|neptune|goofy|taura)
+ jupiter|swordfish|saturn|neptune|goofy|taura|bob|goliath)
INSTALL_DIR=/home/$HOST/public/$INSTALL_DIR_NAME/$FULLARCH
;;
@@ -325,7 +325,7 @@
esac
BETA_FTPHOST=ftp.mercury.csse.unimelb.edu.au
-BETA_FTPDIR=/home/earth/ftp/pub/mercury/beta-releases/$FTP_DIR_NAME
+BETA_FTPDIR=/home/uranus/ftp/pub/mercury/beta-releases/$FTP_DIR_NAME
BETA_WEBDIR_TOP=/home/mercury/public/installed_w3/download/files
BETA_WEBDIR=$BETA_WEBDIR_TOP/beta-releases/$FTP_DIR_NAME
@@ -340,6 +340,7 @@
case $HOST in
saturn|goofy|taura) PARALLEL="-j2" ;;
eris) PARALLEL="-j2" ;;
+ goliath) PARALLEL="-j2" ;;
*) PARALLEL= ;;
esac
@@ -461,31 +462,6 @@
# on at least one host
CONFIG_OPTS="--with-cc=/usr/bin/gcc-3.4"
;;
- earth)
- CONFIG_OPTS="--with-cc=/usr/bin/gcc-3.4 --disable-dotnet-grades"
- INSTALL_LIBGRADES="asm_fast.gc \
- asm_fast.gc.tr \
- asm_fast.gc.debug.tr \
- asm_fast.gc.prof \
- asm_fast.gc.profdeep \
- asm_fast.gc.tsc \
- hlc.gc \
- hlc.par.gc \
- asm_fast.gc.tr.decldebug"
- ;;
- aral)
- # Aral has limited disk space, and not having to expend it
- # on grades not needed by its primary user (zs) helps to
- # conserve it.
- #
- CONFIG_OPTS="--with-cc=/usr/local/gcc-3.4.6/bin/gcc-3.4.6 --enable-deep-profiler=/var/www/cgi-bin"
- INSTALL_LIBGRADES="asm_fast.gc \
- asm_fast.gc.debug.tr \
- asm_fast.gc.mmsc \
- asm_fast.gc.mm.debug \
- asm_fast.gc.profdeep \
- hlc.gc"
- ;;
swordfish)
# swordfish is being used by the G12 group at the moment, so
# it requires trailing versions of most of the grades.
@@ -526,7 +502,28 @@
hlc.gc \
hlc.gc.tr \
hlc.gc.trseg"
- ;;
+ ;;
+ goliath)
+ CONFIG_OPTS="--with-cc=/usr/bin/gcc-3.4"
+ INSTALL_LIBGRADES="asm_fast.gc \
+ hlc.gc \
+ hlc.gc.trseg \
+ hlc.gc.trseg.prof \
+ hlc.gc.trseg.memprof \
+ hlc.gc.trseg.ll_debug \
+ asm_fast.gc.trseg.debug \
+ asm_fast.gc.trseg.decldebug \
+ asm_fast.gc.trseg.profdeep"
+ ;;
+ bob)
+ # bob (a VM on spelter) is used by the G12 group for doing builds of
+ # the MiniZinc distribution. We only need to install the grades that
+ # are required for that.
+ CONFIG_OPTS="--wiht-cc=/usr/bin/gcc-3.4"
+ INSTALL_LIBGRADES="asm_fast.gc \
+ hlc.gc \
+ hlc.gc.trseg"
+ ;;
*)
CONFIG_OPTS=""
;;
@@ -996,15 +993,9 @@
jupiter)
fullname=i686-pc-linux-libc2.3-gnu-O5-intermod
;;
- earth)
- fullname=i686-pc-linux-libc2.3-gnu-O2
- ;;
swordfish)
fullname=i686-pc-linux-libc2.3-gnu-O4-intermod
;;
- aral)
- fullname=i686-pc-linux-libc2.3-gnu-O3
- ;;
saturn)
fullname=x86_64-unknown-linux-gnu-libc2.3-gnu-O5-intermod
;;
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to: mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions: mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------
More information about the reviews
mailing list