changeset 780:7f0e808e3be0

Allow specifying package list for nightly.sh, add explicit "fwl" and "all" stages, better handling of triage directories, do smoketest-all in parallel.
author Rob Landley <rob@landley.net>
date Fri, 03 Jul 2009 20:06:23 -0500
parents 6caf372a8b12
children d8c780ed3686
files .hgignore sources/toys/nightly.sh
diffstat 2 files changed, 25 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Jul 03 19:46:48 2009 -0500
+++ b/.hgignore	Fri Jul 03 20:06:23 2009 -0500
@@ -1,2 +1,3 @@
 ^build/
 ^packages/
+^triage.
--- a/sources/toys/nightly.sh	Fri Jul 03 19:46:48 2009 -0500
+++ b/sources/toys/nightly.sh	Fri Jul 03 20:06:23 2009 -0500
@@ -6,6 +6,8 @@
 TOP="$(pwd)"
 SNAPSHOT_DATE=$(date +"%Y-%m-%d")
 
+TEMPDIR="$TOP"
+
 rm -rf triage.* build &
 
 # Update the scripts, but revert repository back to last release for the
@@ -21,19 +23,31 @@
 # Update each package from repository, generate alt-tarball, and build with
 # that package.
 
-for PACKAGE in busybox uClibc linux ""
+[ -z "$PACKAGES" ] && PACKAGES="busybox uClibc linux fwl all"
+for PACKAGE in $PACKAGES
 do
+  export USE_UNSTABLE="$PACKAGE"
+
+  # Handle special package names "fwl" and "all"
+
+  if [ "$PACKAGE" == "fwl" ]
+  then
+    echo updating build scripts
+    hg update tip
+    USE_UNSTABLE=
+
+  # Note that building the other packages is what updates them,
+  # this just selects and compiles them.
+
+  elif [ "$PACKAGE" == "all" ]
+  then
+    USE_UNSTABLE=busybox,uClibc,linux
+
   # Update package from repository
 
-  export USE_UNSTABLE="$PACKAGE"
-  if [ -z "$PACKAGE" ]
-  then
-    USE_UNSTABLE=busybox,uClibc,linux
-    PACKAGE=all
-    hg update tip
   else
     cd "$TOP/../$PACKAGE"
-    echo pulling "$PACKAGE"
+    echo updating "$PACKAGE"
     git pull
     git archive master --prefix=$PACKAGE/ | bzip2 > \
       "$TOP"/packages/alt-$PACKAGE-0.tar.bz2
@@ -45,13 +59,13 @@
   cd "$TOP"
   FORK=1 CROSS_COMPILERS_EH=i686 NATIVE_COMPILERS_EH=1 nice -n 20 ./buildall.sh
 
-  ./smoketest-all.sh --logs > build/status.txt
+  FORK=1 ./smoketest-all.sh --logs > build/status.txt
 
   DESTDIR="$TOP/../snapshots/$PACKAGE/$SNAPSHOT_DATE"
   rm -rf "$DESTDIR"
   mkdir -p "$DESTDIR"
   mv build/logs build/*.tar.bz2 "$DESTDIR"
-  mv build triage.$PACKAGE
+  mv build "$TEMPDIR/triage.$PACKAGE"
 done
 
 # Upload stuff