Eliminate error message in regress setup if get not present

[bacula/bacula] / regress / scripts / update-ctest.in

diff --git a/regress/scripts/update-ctest.in b/regress/scripts/update-ctest.in
index 4674b67e7d5799f8da62f216a3c0579017ab3a3f..2dee0cb109904d3d36614facb64d70fbc306a98e 100644 (file)
--- a/regress/scripts/update-ctest.in
+++ b/regress/scripts/update-ctest.in
@@ -2,10 +2,8 @@
 
 cd @regressdir@
 
-if [ -d build ] ; then
+if [ ! -d build ] ; then
     echo "Build directory not present, will run make setup"
-    cd @srcdir@
-    svn update > /dev/null
     cd @regressdir@
     make setup
     exit
@@ -13,13 +11,12 @@ fi
 
 cd @regressdir@/build 
 
-cur=`svn info | grep Revision: | awk '{print $2'}`
+touch git-version
+cur=`cat git-version`
 
 cd @srcdir@
 
-svn update > /dev/null
-
-new=`svn info | grep Revision: | awk '{print $2'}`
+new=`git show HEAD | grep -m 1 commit | awk '{print $2}'`
 
 cd @regressdir@
 
@@ -28,6 +25,7 @@ echo Source is ${new}
 
 if [ ${cur}x != ${new}x ] ; then
     echo "Newer version available, will run make setup"
+    git pull
     make setup
 else
     echo "Latest version present in build, skipping make setup"