List:Commits« Previous MessageNext Message »
From:jonas oreland Date:June 10 2011 3:38pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (jonas:4451)
View as plain text  
#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4451 jonas oreland	2011-06-10
      ndb autotest - cleanup formatting, and return to $PWD after building

    modified:
      storage/ndb/test/run-test/autotest-boot.sh
=== modified file 'storage/ndb/test/run-test/autotest-boot.sh'
--- a/storage/ndb/test/run-test/autotest-boot.sh	2011-06-01 08:55:03 +0000
+++ b/storage/ndb/test/run-test/autotest-boot.sh	2011-06-10 15:38:50 +0000
@@ -243,9 +243,9 @@ fi
 if [ "$build" ]
 then
     rm -rf $install_dir
-    
-	if [ -z "$clone1" ]
-	then
+    p=`pwd`
+    if [ -z "$clone1" ]
+    then
         cd $dst_place0
         if [ `uname | grep -ic cygwin || true` -ne 0 ]
         then
@@ -255,18 +255,19 @@ then
             cmd /c devenv.com MySql.sln /Build RelWithDebInfo
             cmd /c devenv.com MySql.sln /Project INSTALL /Build
         else
-	        BUILD/compile-ndb-autotest --prefix=$install_dir0
-	        make install
-        fi
-	else
-	    cd $dst_place0
 	    BUILD/compile-ndb-autotest --prefix=$install_dir0
 	    make install
-	    
-	    cd $dst_place1
-	    BUILD/compile-ndb-autotest --prefix=$install_dir1
-	    make install
-	fi
+        fi
+    else
+	cd $dst_place0
+	BUILD/compile-ndb-autotest --prefix=$install_dir0
+	make install
+	
+	cd $dst_place1
+	BUILD/compile-ndb-autotest --prefix=$install_dir1
+	make install
+    fi
+    cd $p
 fi
 
 


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20110610153850-qpv9ii0milql2nyc.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (jonas:4451) jonas oreland11 Jun