Changeset 81829

Timestamp:

08/05/11 10:15:13 (4 years ago)

Author:

jmr@…

Message:

mpab: have gather_archives.sh look for logs in their tmp location as well, in case mpab didn't finish cleanly

File:

• contrib/mpab/gather_archives.sh (modified) (2 diffs)

contrib/mpab/gather_archives.sh

@@ -1 +1 @@
 #!/bin/sh
+
+CHROOTSUBDIR=mpchroot
+dataDir=$(pwd)
+if [[ -n "$MPAB_DATA" ]]; then
+   dataDir=$MPAB_DATA
+fi
+chrootPath="${dataDir}/${CHROOTSUBDIR}"
+OSMajor=`uname -r | sed 's/\..*//'`
+# xcodebuild breaks in chroots on 10.6
+if [[ $1 = "-n" || $OSMajor -ge 10 ]]; then
+    chrootPath=""
+    if [[ $1 = "-n" ]]; then
+        shift
+    fi
+fi
 
 if [[ -z "$PORTLISTFILE" ]]; then
@@ -21 +36 @@
 fi
 
+# if mpab was killed due to a timeout, logs will still be in the tmp dir
+if ! ls logs-* > /dev/null 2>&1 ; then
+    now=`date '+%Y%m%d-%H%M%S'`
+    baseDir=$(dirname $0)
+    mkdir ${baseDir}/logs-${now}
+    mv ${chrootPath}/var/tmp/portresults/fail ${baseDir}/logs-${now}
+    mv ${chrootPath}/var/tmp/portresults/success ${baseDir}/logs-${now}
+    chmod -R a+rX ${baseDir}/logs-${now}
+fi
+
 for portname in $ports; do
     if ls logs-*/success/${portname}.log > /dev/null 2>&1 ; then