mirror of
https://github.com/Mercury-Language/mercury.git
synced 2025-12-13 12:53:53 +00:00
Fix a couple of problems with testing on new hosts:
Branches: main Estimated hours taken: 8 (about 0.25 to fix plus lots of testing time) tools/test_mercury: Fix a couple of problems with testing on new hosts: - cd to the right directory before invoking `mmake echo_libgrades' - don't try to tag the repository if the sources were checked out with anonymous CVS, since the attempt would fail due to lack of write access.
This commit is contained in:
@@ -935,7 +935,7 @@ case $HOST in
|
||||
# asm_fast.gc.memprof asm_fast.gc.tr"
|
||||
;;
|
||||
*)
|
||||
GRADES="`mmake echo_libgrades`"
|
||||
GRADES="`(cd $DIR/mercury && mmake echo_libgrades)`"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -1161,16 +1161,29 @@ ulimit -S -t unlimited
|
||||
fi &&
|
||||
mv mercury/mercury-$version.$fullarch.tar.gz \
|
||||
$UNSTABLE/mercury-$version.$fullname.tar.gz &&
|
||||
echo "test_mercury tagging unstable $BASE_TAG_NAME, starting at `date`" 1>&2 &&
|
||||
cvs rtag -d unstable-$BASE_TAG_NAME-$fullname_tag mercury clpr tests &&
|
||||
cvs tag unstable-$BASE_TAG_NAME-$fullname_tag mercury tests &&
|
||||
if [ -d gcc/. ] && [ -d mercury-gcc/. ]; then
|
||||
cvs rtag -d unstable-$BASE_TAG_NAME-$fullname_tag mercury-gcc &&
|
||||
cvs tag unstable-$BASE_TAG_NAME-$fullname_tag mercury-gcc
|
||||
else
|
||||
true
|
||||
fi &&
|
||||
echo "test_mercury tagging unstable $BASE_TAG_NAME, finished at `date`" 1>&2
|
||||
case "$CVSROOT" in
|
||||
:pserver:guest* | :pserver:anon*)
|
||||
echo "Not tagging CVS repository" \
|
||||
"(no write access for anonymous cvs)"
|
||||
;;
|
||||
*)
|
||||
echo "test_mercury tagging unstable $BASE_TAG_NAME," \
|
||||
"starting at `date`" 1>&2 &&
|
||||
cvs rtag -d unstable-$BASE_TAG_NAME-$fullname_tag \
|
||||
mercury clpr tests &&
|
||||
cvs tag unstable-$BASE_TAG_NAME-$fullname_tag mercury tests &&
|
||||
if [ -d gcc/. ] && [ -d mercury-gcc/. ]; then
|
||||
cvs rtag -d unstable-$BASE_TAG_NAME-$fullname_tag \
|
||||
mercury-gcc &&
|
||||
cvs tag unstable-$BASE_TAG_NAME-$fullname_tag \
|
||||
mercury-gcc
|
||||
else
|
||||
true
|
||||
fi &&
|
||||
echo "test_mercury tagging unstable $BASE_TAG_NAME," \
|
||||
"finished at `date`" 1>&2
|
||||
;;
|
||||
esac
|
||||
} || set_status "creating binary distribution"
|
||||
|
||||
case $status in
|
||||
@@ -1189,16 +1202,28 @@ case $status in
|
||||
$BETA_FTPDIR/mercury-$RELEASE_VERSION_PATTERN.$fullname.tar.gz \
|
||||
$BETA_FTPDIR/mercury-$RELEASE_VERSION_PATTERN.$fullname.txt" &&
|
||||
rcp $STABLE/mercury*-$version.$fullname.* $BETA_FTPHOST:$BETA_FTPDIR &&
|
||||
echo "test_mercury tagging stable $BASE_TAG_NAME, starting at `date`" 1>&2 &&
|
||||
cvs rtag -d stable-$BASE_TAG_NAME-$fullname_tag mercury clpr tests &&
|
||||
cvs tag stable-$BASE_TAG_NAME-$fullname_tag mercury tests &&
|
||||
if [ -d gcc/. ] && [ -d mercury-gcc/. ]; then
|
||||
cvs rtag -d stable-$BASE_TAG_NAME-$fullname_tag mercury-gcc &&
|
||||
cvs tag stable-$BASE_TAG_NAME-$fullname_tag mercury-gcc
|
||||
else
|
||||
true
|
||||
fi &&
|
||||
echo "test_mercury tagging stable $BASE_TAG_NAME, finished at `date`" 1>&2
|
||||
case "$CVSROOT" in
|
||||
:pserver:guest* | :pserver:anon*)
|
||||
echo "Not tagging CVS repository" \
|
||||
"(no write access for anonymous cvs)"
|
||||
;;
|
||||
*)
|
||||
echo "test_mercury tagging stable $BASE_TAG_NAME," \
|
||||
"starting at `date`" 1>&2 &&
|
||||
cvs rtag -d stable-$BASE_TAG_NAME-$fullname_tag \
|
||||
mercury clpr tests &&
|
||||
cvs tag stable-$BASE_TAG_NAME-$fullname_tag mercury tests &&
|
||||
if [ -d gcc/. ] && [ -d mercury-gcc/. ]; then
|
||||
cvs rtag -d stable-$BASE_TAG_NAME-$fullname_tag \
|
||||
mercury-gcc &&
|
||||
cvs tag stable-$BASE_TAG_NAME-$fullname_tag mercury-gcc
|
||||
else
|
||||
true
|
||||
fi &&
|
||||
echo "test_mercury tagging stable $BASE_TAG_NAME," \
|
||||
"finished at `date`" 1>&2
|
||||
;;
|
||||
esac
|
||||
} || set_status "copying binary distribution"
|
||||
;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user