From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 8 Mar 2013 10:26:09 +0000 (+0000)
Subject: Finish build_test
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2547eafb37efe10b0c87a4d16baf6ad88a5472a4;p=dealii-svn.git

Finish build_test

git-svn-id: https://svn.dealii.org/trunk@28812 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/contrib/utilities/build_test b/deal.II/contrib/utilities/build_test
index e8f89310be..5d9e9311a3 100755
--- a/deal.II/contrib/utilities/build_test
+++ b/deal.II/contrib/utilities/build_test
@@ -20,17 +20,24 @@
 #   CLEAN_TMPDIR - defaults to "true"
 #
 
+#
+# Specify default values:
+#
 SOURCEDIR=$(CURDIR)
+LOGDIR=$(PWD)
 TMPDIR=/tmp
 CMAKE=cmake
 SVN=svn info
+
+branch:=$(shell $(SVN) $(SOURCEDIR) | perl -ne 'print "$$1" if m/svn\.dealii\.org\/(.+)\/deal.II/;')
+revision:=$(shell $(SVN) $(SOURCEDIR) | perl -ne 'print "$$_" if s/Last Changed Rev: //;')
+
 date:= $(shell date +%s)
 random:=$(shell echo "$$RANDOM")
 testdir:= "$(TMPDIR)"/deal-build-test.$(date)-$(random)
 builddir:= $(testdir)/build
 installdir:= $(testdir)/install
-LOGDIR=$(PWD)
-LOGFILE=$(LOGDIR)/$(firstword $(notdir $(CONFIGFILE)) automatic).$(date).log
+LOGFILE=$(LOGDIR)/$(firstword $(branch) unknown_branch).$(firstword $(notdir $(CONFIGFILE)) no_configuration).$(date).log
 CLEAN_TMPDIR=true
 
 PIPEnTRAP:= >>$(LOGFILE) 2>&1 || (if ${CLEAN_TMPDIR}; then rm -rf $(testdir); fi; false)
@@ -43,7 +50,8 @@ main:
 	mkdir -p $(installdir)
 	@echo "AUTOMATED DEAL.II BUILD TEST" | tee $(LOGFILE)
 	@echo "BEGIN HEADER `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE)
-	@$(SVN) $(SOURCEDIR) | perl -ne 'print "dealii-feature: revision=$$_" if s/Last Changed Rev: //; print "dealii-feature: branch=$$1\n" if m/svn\.dealii\.org\/(.+)\/deal.II/;' | tee -a $(LOGFILE)
+	@echo "dealii-feature: branch=$(branch)" | tee -a $(LOGFILE)
+	@echo "dealii-feature: revision=$(revision)" | tee -a $(LOGFILE)
 	@echo "dealii-feature: user=$(USER)" | tee -a $(LOGFILE)
 	@echo "dealii-feature: host=`hostname`" | tee -a $(LOGFILE)
 	@echo "dealii-feature: configuration=`basename \"$(CONFIGFILE)\"`" | tee -a $(LOGFILE)