diff options
| author | michelou <michelou@epfl.ch> | 2008-01-15 12:12:23 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2008-01-15 12:12:23 +0000 |
| commit | 1a87dcf96b22e1c48b30aa8cccffe3ab52de9694 (patch) | |
| tree | e6f503a6f749016822722fce7da891fd0a3625b2 /test | |
| parent | d27d64aa3087f119b570116019891e8a4e50934f (diff) | |
| download | scala-1a87dcf96b22e1c48b30aa8cccffe3ab52de9694.tar.gz scala-1a87dcf96b22e1c48b30aa8cccffe3ab52de9694.tar.bz2 scala-1a87dcf96b22e1c48b30aa8cccffe3ab52de9694.zip | |
updated nightly build scripts
Diffstat (limited to 'test')
| -rwxr-xr-x | test/scala2-nightly-test.scm | 5 | ||||
| -rwxr-xr-x | test/scala2-nightly-test.sh | 33 |
2 files changed, 27 insertions, 11 deletions
diff --git a/test/scala2-nightly-test.scm b/test/scala2-nightly-test.scm index dd67459239..403a9c8f78 100755 --- a/test/scala2-nightly-test.scm +++ b/test/scala2-nightly-test.scm @@ -17,7 +17,7 @@ exec scsh -e main -s "$0" "$@" (define scala-svn-module-name "scala") ;; E-mail address to which the failure notification should be sent. -(define notify-email "scala-devel@groupes.epfl.ch") +(define notify-email "scala-reports@groupes.epfl.ch") ;;(define notify-email "stephane.micheloud@epfl.ch") ; DEBUG ;;(define notify-email "lex.spoon@epfl.ch") ; DEBUG @@ -79,7 +79,8 @@ exec scsh -e main -s "$0" "$@" (with-cwd scala-svn-module-name (start-section "Creating small Scala distribution") (fail-if-error (run (ant pack))) - (fail-if-error (run (ant docs.compiler))) +;; (fail-if-error (run (ant msil))) + (run (ant msil)) (start-section "Testing Scala compiler") (fail-if-error (run (./test/scalatest --color=none diff --git a/test/scala2-nightly-test.sh b/test/scala2-nightly-test.sh index 281009fc88..a62ce85825 100755 --- a/test/scala2-nightly-test.sh +++ b/test/scala2-nightly-test.sh @@ -1,19 +1,24 @@ #!/bin/sh -[ -z "$JAVA_SDK" ] && JAVA_SDK=java -[ -z "$JAVA_VERSION" ] && JAVA_VERSION=1.5 +[ -z "$JAVA_SDK" ] && ( echo "Variable JAVA_SDK not specified"; exit 1 ) +ANDROID_HOME=/home/linuxsoft/apps/android ANT_HOME=/home/linuxsoft/apps/ant -JAVA_HOME=/home/linuxsoft/apps/$JAVA_SDK-$JAVA_VERSION -SCSH_HOME=/home/linuxsoft/apps/scsh-rh9 +JAVA_HOME=/home/linuxsoft/apps/$JAVA_SDK +# uses scsh wrapper in ~/bin instead (mics) +#SCSH_HOME=/home/linuxsoft/apps/scsh-rh9 +MONO_HOME=/home/linuxsoft/apps/mono +KVEM_HOME=/home/linuxsoft/apps/java-wtk + +[ -d "$JAVA_HOME" ] || (echo "Invalid directory $JAVA_HOME"; exit 1 ) PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin -PATH=$ANT_HOME/bin:$JAVA_HOME/bin:$SCSH_HOME/bin:$PATH +PATH=$ANT_HOME/bin:$JAVA_HOME/bin:$MONO_HOME/bin:$ANDROID_HOME/tools:$KVEM_HOME/bin:~/bin:$PATH -ANT_OPTS="-Xms512M -Xmx768M" +ANT_OPTS="-Xms1024M -Xmx1024M" BUILD_DATE=`date +"%Y-%m-%d"` -OUTPUT_DIR=~/scala-nightly-test/$JAVA_SDK-$JAVA_VERSION +OUTPUT_DIR=~/scala-nightly-test/$JAVA_SDK TARGET_DIR=$OUTPUT_DIR/$BUILD_DATE-scala2 BUILD_DIR=$TARGET_DIR/scala/build LATEST_DIR=$TARGET_DIR/scala/dists @@ -21,9 +26,18 @@ NIGHTLY_DIR=/home/linuxsoft/archives/scala/nightly [ -d "$OUTPUT_DIR" ] || mkdir -p "$OUTPUT_DIR" -env PATH="$PATH" ANT_OPTS="$ANT_OPTS" ~/bin/scala2-nightly-test.scm $OUTPUT_DIR +JAVACMD=$JAVA_HOME/bin/java + +killall -9 scshvm 2>1 +killall -9 java 2>1 + +env PATH="$PATH" ANT_OPTS="$ANT_OPTS" JAVACMD="$JAVACMD" \ + ANDROID_HOME="$ANDROID_HOME" \ + ~/bin/scala2-nightly-test.scm $OUTPUT_DIR -if [ -d "$LATEST_DIR" ] && [ `ls "$LATEST_DIR"/*.zip | wc -l` -gt 0 ]; then +[ "$JAVA_SDK"="java-1.5" ] || exit 0 + +if [ -d "$LATEST_DIR" ] && [ `ls "$LATEST_DIR"/*.zip 2>1 | wc -l` -gt 0 ]; then (rm -rf $NIGHTLY_DIR && mkdir $NIGHTLY_DIR) (cd $LATEST_DIR && cp *.tgz *.zip *.md5 *.sbp *.advert $NIGHTLY_DIR) (cd $TARGET_DIR && cp log-scala2 $NIGHTLY_DIR) @@ -32,3 +46,4 @@ fi if [ -d "$BUILD_DIR/api-compiler" ] && [ -d "$NIGHTLY_DIR/scala/doc/scala" ]; then cp -r $BUILD_DIR/api-compiler $NIGHTLY_DIR/scala/doc/scala fi + |