[Xquartz-changes] [548] tinderbox

source_changes at macosforge.org source_changes at macosforge.org
Sat Apr 30 11:47:31 PDT 2011


Revision: 548
          http://trac.macosforge.org/projects/xquartz/changeset/548
Author:   jeremyhu at freedesktop.org
Date:     2011-04-30 11:47:29 -0700 (Sat, 30 Apr 2011)
Log Message:
-----------
Remove the datestamped subdirectory

Modified Paths:
--------------
    tinderbox/jhbuildrc.xquartz
    tinderbox/tinderbox_test.sh

Modified: tinderbox/jhbuildrc.xquartz
===================================================================
--- tinderbox/jhbuildrc.xquartz	2011-04-30 00:13:41 UTC (rev 547)
+++ tinderbox/jhbuildrc.xquartz	2011-04-30 18:47:29 UTC (rev 548)
@@ -18,4 +18,4 @@
 
 scan_build = True
 scan_buildargs = '-v --use-cc=clang --use-c++=clang++'
-scan_build_outputdir = os.path.join(os.environ['JHBUILDDIR'] , 'analyzer', os.environ['CONFIG'])
+scan_build_outputdir = os.path.join(os.environ['JHBUILDDIR'] , os.environ['ANALYZERSUBDIR'])

Modified: tinderbox/tinderbox_test.sh
===================================================================
--- tinderbox/tinderbox_test.sh	2011-04-30 00:13:41 UTC (rev 547)
+++ tinderbox/tinderbox_test.sh	2011-04-30 18:47:29 UTC (rev 548)
@@ -70,29 +70,29 @@
 
 [[ -d "${JHBUILDDIR}/build/share/aclocal" ]] || mkdir -p "${JHBUILDDIR}/build/share/aclocal"
 
-upload_analyzer() {
-    ssh jeremyhu at people.freedesktop.org mkdir -p w/${1} &&
-    rsync --archive --force --whole-file --delete --delete-after --verbose --compress ${JHBUILDDIR}/${1}/ jeremyhu at people.freedesktop.org:w/${1}
-}
+export ANALYZERSUBDIR="analyzer/${CONFIG}/$(date +"%Y%m%d-%H%M")"
+[[ -r ${JHBUILDDIR}/fdo.rsa ]] && mkdir -p ${JHBUILDDIR}/${ANALYZERSUBDIR}
 
 upload_analyzer_results() {
     if [[ ! -r ${JHBUILDDIR}/fdo.rsa ]] ; then
         return 0
     fi
 
-    rmdir ${JHBUILDDIR}/analyzer/${CONFIG}/* >& /dev/null
+    # Remove empty directories
+    rmdir ${JHBUILDDIR}/${ANALYZERSUBDIR}/* >& /dev/null
 
+    # Remove analyzer's created subdirectories
+    for projdir in ${JHBUILDDIR}/${ANALYZERSUBDIR}/* ; do
+        mv ${projdir}/20*-*-*-*/* ${projdir}
+	rmdir ${projdir}/20*-*-*-*
+    done
+
     eval $(/usr/bin/ssh-agent -s)
     /usr/bin/ssh-add "${JHBUILDDIR}/fdo.rsa"
 
-    #perl -n -e "if(m/scan-build: Run 'scan-view .*\/(analyzer\/.*)' to examine bug reports\./) { print \$1.\"\n\";}" |
-    #while read path ; do
-    #    upload_analyzer "${path}" < /dev/null
-    #done
+    ssh jeremyhu at people.freedesktop.org mkdir -p w/${ANALYZERSUBDIR} &&
+    rsync --archive --force --whole-file --delete --delete-after --verbose --compress ${JHBUILDDIR}/${ANALYZERSUBDIR}/ jeremyhu at people.freedesktop.org:w/${ANALYZERSUBDIR}
 
-    # Do one final rsync to sync old log removal
-    upload_analyzer analyzer/${CONFIG}
-
     kill ${SSH_AGENT_PID}
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110430/1947056c/attachment.html>


More information about the Xquartz-changes mailing list