diff --git a/vagrantSandbox/README b/vagrantSandbox/README index f512f46d2..9acf60067 100644 --- a/vagrantSandbox/README +++ b/vagrantSandbox/README @@ -48,8 +48,9 @@ machine prepended with =vagrant.= * Virtual machines Currently existing virtual machines are - - precise :: Latest LTS Ubuntu. Currently the default machine to use - - lucid :: Previous LTS Ubuntu. Currently problems + - trusty :: Latest LTS 14.04 Ubuntu. Currently the default machine to use + - prescise :: Previous LTS Ubuntu. + - lucid :: Old LTS Ubuntu. Currently problems with automatic setting up (something with the =postfix=-package) - maverick :: Tries to fix the problems with the @@ -75,6 +76,8 @@ the ThirdParty-packages in one go (no paraview and QT). If this works the box is considered operational. The script leaves a log file =bootstrapFoam-log= in the home directory + - bootstrapAndTest.sh :: Calls =bootstrapFoam.sh= and then runs the + =testHarness= in the =foam=-installation * Provisioning scripts Every "family" of machines has a specific script that makes sure that the software packages necessary to compile =Foam= are installed diff --git a/vagrantSandbox/Vagrantfile b/vagrantSandbox/Vagrantfile index 9880aeb95..43827dc9d 100644 --- a/vagrantSandbox/Vagrantfile +++ b/vagrantSandbox/Vagrantfile @@ -4,7 +4,7 @@ Vagrant.configure("2") do |config| config.vm.synced_folder "..", "/FOAM-sources" - config.vm.hostname="vagrant."+ (ENV["HOSTNAME"] || `hostname`.strip) + config.vm.hostname="vagrant_"+ (ENV["HOSTNAME"] || `hostname`.strip) nrCPU=1 if ENV["WM_VAGRANT_CPUS"] diff --git a/vagrantSandbox/skel/bootstrapAndTest.sh b/vagrantSandbox/skel/bootstrapAndTest.sh new file mode 100755 index 000000000..1dcb9fd42 --- /dev/null +++ b/vagrantSandbox/skel/bootstrapAndTest.sh @@ -0,0 +1,12 @@ +#! /usr/bin/env bash + +/home/vagrant/bootstrapFoam.sh + +cd foam/foam-extend-3.0 +source etc/bashrc + +cd testHarness/foam-extend/3.0/runDir + +./Allclean + +./Allrun_Experimental diff --git a/vagrantSandbox/skel/bootstrapFoam.sh b/vagrantSandbox/skel/bootstrapFoam.sh index 8bb0e26c0..b22c5c467 100755 --- a/vagrantSandbox/skel/bootstrapFoam.sh +++ b/vagrantSandbox/skel/bootstrapFoam.sh @@ -23,3 +23,6 @@ source etc/bashrc ./Allwmake 2>&1 | tee --append $BOOTSTRAPLOG +# compile swak4Foam +cd $WM_THIRD_PARTY_DIR +./AllMake.stage5 2>&1 | tee --append $BOOTSTRAPLOG